httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r613263 - /httpd/httpd/trunk/server/mpm_common.c
Date Fri, 18 Jan 2008 20:49:47 GMT
Author: jorton
Date: Fri Jan 18 12:49:46 2008
New Revision: 613263

URL: http://svn.apache.org/viewvc?rev=613263&view=rev
Log:
* server/mpm_common.c (reclaim_one_pid): Retrieve the exit status from
  apr_proc_wait(); call ap_process_child_status() for children which
  terminate, to ensure that abnormal exits (e.g. SIGSEGV) are logged.

PR: 42757

Modified:
    httpd/httpd/trunk/server/mpm_common.c

Modified: httpd/httpd/trunk/server/mpm_common.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_common.c?rev=613263&r1=613262&r2=613263&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_common.c (original)
+++ httpd/httpd/trunk/server/mpm_common.c Fri Jan 18 12:49:46 2008
@@ -126,6 +126,8 @@
 {
     apr_proc_t proc;
     apr_status_t waitret;
+    apr_exit_why_e why;
+    int status;
 
     /* Ensure pid sanity. */
     if (pid < 1) {
@@ -133,8 +135,11 @@
     }        
 
     proc.pid = pid;
-    waitret = apr_proc_wait(&proc, NULL, NULL, APR_NOWAIT);
+    waitret = apr_proc_wait(&proc, &status, &why, APR_NOWAIT);
     if (waitret != APR_CHILD_NOTDONE) {
+#ifdef AP_MPM_WANT_PROCESS_CHILD_STATUS
+        ap_process_child_status(&proc, why, status);
+#endif
         return 1;
     }
 



Mime
View raw message