Return-Path: 
 <cvs-return-26291-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 95135 invoked from network); 28 Jan 2007 21:15:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 28 Jan 2007 21:15:03 -0000
Received: (qmail 30717 invoked by uid 500); 28 Jan 2007 21:15:09 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 30674 invoked by uid 500); 28 Jan 2007 21:15:08 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 30663 invoked by uid 99); 28 Jan 2007 21:15:08 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Jan 2007 13:15:08 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Jan 2007 13:15:02 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id A84831A981A; Sun, 28 Jan 2007 13:14:41 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r500881 - in /httpd/httpd/trunk: CHANGES
 server/mpm_common.c
Date: Sun, 28 Jan 2007 21:14:41 -0000
To: cvs@httpd.apache.org
From: trawick@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070128211441.A84831A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: trawick
Date: Sun Jan 28 13:14:40 2007
New Revision: 500881

URL: http://svn.apache.org/viewvc?view=rev&rev=500881
Log:
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


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

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?view=diff&rev=500881&r1=500880&r2=500881
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sun Jan 28 13:14:40 2007
@@ -2,6 +2,10 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+  *) Unix MPMs: Catch SIGFPE so that exception hooks and CoreDumpDirectory
+     can work after that terminating signal.
+     [Eric Covener <covener gmail.com>]
+
   *) mod_dbd: Create memory sub-pools for each DB connection and close
      DB connections in a pool cleanup function.  Ensure prepared statements
      are destroyed before DB connection is closed.  When using reslists,

Modified: httpd/httpd/trunk/server/mpm_common.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_common.c?view=diff&rev=500881&r1=500880&r2=500881
==============================================================================
--- httpd/httpd/trunk/server/mpm_common.c (original)
+++ httpd/httpd/trunk/server/mpm_common.c Sun Jan 28 13:14:40 2007
@@ -1187,6 +1187,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 */
 
@@ -1202,6 +1206,9 @@
 #endif /* SIGABRT */
 #ifdef SIGILL
     apr_signal(SIGILL, sig_coredump);
+#endif /* SIGILL */
+#ifdef SIGFPE
+    apr_signal(SIGFPE, sig_coredump);
 #endif /* SIGILL */
 
 #endif /* NO_USE_SIGACTION */