Get apache -k restart -n apache2 working reliabily again.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93359 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 189a80a8ee592e93caba0d1c812e46cd771d83d0..c609400723fa086402612d5a6192f55be99b2e95 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
 Changes with Apache 2.0.32-dev
+  *) Win32: Get apache -k restart -n apache2 working reliabily again.
+     [Bill Stoddard]
  
   *) Remove all signals from the worker MPM's child process.  Instead,
      the parent uses the Pipe of Death for all communication with the

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index a280fbcdcfb3e37eb8196a16c7782b15ce74d192..49d35a1684bb18f5ff5949182a2ce0b7e364c189 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -1496,7 +1496,7 @@ static int create_process(apr_pool_t *p, HANDLE *child_proc, HANDLE *child_exit_
     }
 
     /* Child's initial stderr -> our main server error log (or, failing that, stderr) */
-    if (ap_server_conf->error_log) {
+    if (ap_server_conf->error_log) { /* Is this check really necessary?*/
         rv = apr_os_file_get(&hShareError, ap_server_conf->error_log);
         if (rv == APR_SUCCESS && hShareError != INVALID_HANDLE_VALUE) {
             if (DuplicateHandle(hCurrentProcess, hShareError, 
@@ -1524,9 +1524,9 @@ static int create_process(apr_pool_t *p, HANDLE *child_proc, HANDLE *child_exit_
             CloseHandle(hNullOutput);
             return -1;
         }
-        else {
-            hShareError = GetStdHandle(STD_ERROR_HANDLE);
-        }
+    }
+    else {
+        hShareError = GetStdHandle(STD_ERROR_HANDLE);
     }
 
     /* Create the child_exit_event */