]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1629925, r1629927, r1629928, r1733162, r1733173 from trunk:
authorStefan Eissing <icing@apache.org>
Thu, 17 Mar 2016 09:42:18 +0000 (09:42 +0000)
committerStefan Eissing <icing@apache.org>
Thu, 17 Mar 2016 09:42:18 +0000 (09:42 +0000)
commit04032463debb70ae63d4233d3b1bbe5b7548fd30
tree578c2f04b0753c059135e11302f05ddf5967f72c
parent0e23f24c8775cc3ffc40faa396d5d266b4700cfd
Merge r1629925, r1629927, r1629928, r1733162, r1733173 from trunk:

Ensure that httpd exits with an error status when the MPM fails
to run.  [Yann Ylavic]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1735381 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
server/main.c
server/mpm/event/event.c
server/mpm/mpmt_os2/mpmt_os2.c
server/mpm/netware/mpm_netware.c
server/mpm/prefork/prefork.c
server/mpm/winnt/mpm_winnt.c
server/mpm/worker/worker.c