From 402a038805265e18f0b4cedf5f0c3902a2354e56 Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Wed, 27 Feb 2002 03:52:20 +0000 Subject: [PATCH] Whoh boy that's rough... We sometimes like to answer SIGHUP in the parent process, don't we? This -was- post-fork() in 1.3, but with the massive restructuring, we inadvertantly now whack the parent process. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93587 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ modules/mappers/mod_rewrite.c | 5 ----- server/log.c | 8 -------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index f6358141b9..ae0cdfb759 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,9 @@ Changes with Apache 2.0.33-dev + *) Prevent Apache from ignoring SIGHUP due to some lingering 1.3 + cruft in piped logs and rewrite child processes. + [William Rowe] + *) All instances of apr_lock_t have been removed and converted to one of the following new lock APIs: apr_thread_mutex.h, apr_proc_mutex.h, or apr_global_mutex.h. No new code should diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c index f3d8fbf20f..8c776c5088 100644 --- a/modules/mappers/mod_rewrite.c +++ b/modules/mappers/mod_rewrite.c @@ -3363,11 +3363,6 @@ static apr_status_t rewritemap_program_child(apr_pool_t *p, const char *progname apr_procattr_t *procattr; apr_proc_t *procnew; -#ifdef SIGHUP - apr_signal(SIGHUP, SIG_IGN); -#endif - - if (((rc = apr_procattr_create(&procattr, p)) != APR_SUCCESS) || ((rc = apr_procattr_io_set(procattr, APR_FULL_BLOCK, APR_FULL_NONBLOCK, diff --git a/server/log.c b/server/log.c index b339b8ba11..e80d3acc83 100644 --- a/server/log.c +++ b/server/log.c @@ -197,11 +197,6 @@ static int log_child(apr_pool_t *p, const char *progname, apr_procattr_t *procattr; apr_proc_t *procnew; -#ifdef SIGHUP - /* No concept of a child process on Win32 */ - apr_signal(SIGHUP, SIG_IGN); -#endif /* ndef SIGHUP */ - if (((rc = apr_procattr_create(&procattr, p)) == APR_SUCCESS) && ((rc = apr_procattr_io_set(procattr, APR_FULL_BLOCK, @@ -604,9 +599,6 @@ static int piped_log_spawn(piped_log *pl) apr_proc_t *procnew = NULL; apr_status_t status; -#ifdef SIGHUP - apr_signal(SIGHUP, SIG_IGN); -#endif if (((status = apr_procattr_create(&procattr, pl->p)) != APR_SUCCESS) || ((status = apr_procattr_child_in_set(procattr, ap_piped_log_read_fd(pl), -- 2.40.0