Commit 5422e44a authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@501130 13f79535-47bb-0310-9956-ffa450edef68
parent 31b66cd4

CHANGES

+4 −0
Original line number Diff line number Diff line 
                                                        -*- 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]

































STATUS



+0
−6






























Original line number
Diff line number
Diff line








@@ -194,9 +194,3 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:













     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





































server/mpm_common.c



+7
−0






























Original line number
Diff line number
Diff line








@@ -1217,6 +1217,10 @@ apr_status_t ap_fatal_signal_setup(server_rec *s, apr_pool_t *in_pconf)













    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 @@ apr_status_t ap_fatal_signal_setup(server_rec *s, apr_pool_t *in_pconf)













#ifdef SIGILL















    apr_signal(SIGILL, sig_coredump);















#endif /* SIGILL */













#ifdef SIGFPE













    apr_signal(SIGFPE, sig_coredump);













#endif /* SIGFPE */































#endif /* NO_USE_SIGACTION */