httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r501130 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS server/mpm_common.c
Date Mon, 29 Jan 2007 17:54:12 GMT
Author: trawick
Date: Mon Jan 29 09:54:10 2007
New Revision: 501130

URL: http://svn.apache.org/viewvc?view=rev&rev=501130
Log:
Merge from trunk:
  Unix MPMs: Catch SIGFPE so that exception hooks and CoreDumpDirectory
  can work after that terminating signal.

Submitted by: Eric Covener <covener gmail.com>
Reviewed by: trawick, rpluem, jorton

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/server/mpm_common.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=diff&rev=501130&r1=501129&r2=501130
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon Jan 29 09:54:10 2007
@@ -1,6 +1,10 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.5
 
+  *) Unix MPMs: Catch SIGFPE so that exception hooks and CoreDumpDirectory
+     can work after that terminating signal.
+     [Eric Covener <covener gmail.com>]
+
   *) Win32: Makefile.win will now build with MS VC 8 (Visual Studio 2005)
      including embedding the .manifest information into each binary.
      [William Rowe]

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=501130&r1=501129&r2=501130
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Jan 29 09:54:10 2007
@@ -194,9 +194,3 @@
      http://svn.apache.org/viewvc?view=rev&revision=486320
      +1: trawick, rpluem
 
-   * Unix MPMs: Catch SIGFPE so that exception hooks and CoreDumpDirectory
-     can work after that terminating signal.
-     http://svn.apache.org/viewvc?view=rev&revision=500881
-     http://svn.apache.org/viewvc?view=rev&revision=500897
-     +1: trawick, rpluem, jorton
-

Modified: httpd/httpd/branches/2.2.x/server/mpm_common.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/mpm_common.c?view=diff&rev=501130&r1=501129&r2=501130
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm_common.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm_common.c Mon Jan 29 09:54:10 2007
@@ -1217,6 +1217,10 @@
     if (sigaction(SIGILL, &sa, NULL) < 0)
         ap_log_error(APLOG_MARK, APLOG_WARNING, errno, s, "sigaction(SIGILL)");
 #endif
+#ifdef SIGFPE
+    if (sigaction(SIGFPE, &sa, NULL) < 0)
+        ap_log_error(APLOG_MARK, APLOG_WARNING, errno, s, "sigaction(SIGFPE)");
+#endif
 
 #else /* NO_USE_SIGACTION */
 
@@ -1233,6 +1237,9 @@
 #ifdef SIGILL
     apr_signal(SIGILL, sig_coredump);
 #endif /* SIGILL */
+#ifdef SIGFPE
+    apr_signal(SIGFPE, sig_coredump);
+#endif /* SIGFPE */
 
 #endif /* NO_USE_SIGACTION */
 



Mime
View raw message