Merge r1587255 from trunk:

* support/rotatelogs.c (main): Prevent creation of zombies from
  post-rotate programs.

Reviewed by: druggeri, ylavic, covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1588175 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2014-04-17 09:00:36 +00:00
parent 7d13bc4816
commit 94e2006de1
2 changed files with 8 additions and 0 deletions

View File

@ -2,6 +2,9 @@
Changes with Apache 2.4.10
*) rotatelogs: Avoid creation of zombie processes when -p is used on
Unix platforms. [Joe Orton]
*) mod_authnz_fcgi: New module to enable FastCGI authorizer
applications to authenticate and/or authorize clients.
[Jeff Trawick]

View File

@ -24,6 +24,7 @@
#include "apr_time.h"
#include "apr_getopt.h"
#include "apr_thread_proc.h"
#include "apr_signal.h"
#if APR_FILES_AS_SOCKETS
#include "apr_poll.h"
#endif
@ -557,6 +558,10 @@ int main (int argc, const char * const argv[])
break;
case 'p':
config.postrotate_prog = opt_arg;
#ifdef SIGCHLD
/* Prevent creation of zombies (on modern Unix systems). */
apr_signal(SIGCHLD, SIG_IGN);
#endif
break;
case 'f':
config.force_open = 1;