You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2012/07/27 21:51:57 UTC
svn commit: r1366515 - in /httpd/httpd/branches/2.2.x: ./ CHANGES STATUS
server/mpm/prefork/prefork.c
Author: trawick
Date: Fri Jul 27 19:51:57 2012
New Revision: 1366515
URL: http://svn.apache.org/viewvc?rev=1366515&view=rev
Log:
Merge r1363183 from trunk:
mpm_prefork: Reduce spawn rate after a child process exits due to
unexpected poll or accept failure.
Submitted by: trawick
Reviewed by: jorton, rjung
Modified:
httpd/httpd/branches/2.2.x/ (props changed)
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c
Propchange: httpd/httpd/branches/2.2.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1363183
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1366515&r1=1366514&r2=1366515&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Jul 27 19:51:57 2012
@@ -5,6 +5,9 @@ Changes with Apache 2.2.23
envvars: Fix insecure handling of LD_LIBRARY_PATH that could lead to the
current working directory to be searched for DSOs. [Stefan Fritsch]
+ *) mpm_prefork: Reduce spawn rate after a child process exits due to
+ unexpected poll or accept failure. [Jeff Trawick]
+
*) core: Adjust ap_scan_script_header_err*() to prevent mod_cgi and mod_cgid
from logging bogus data in case of errors. [Stefan Fritsch]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1366515&r1=1366514&r2=1366515&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Jul 27 19:51:57 2012
@@ -103,12 +103,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
sf notes: The docs should get a compatibility note once it is clear
in which 2.2.x version it gets introduced.
- * mpm_prefork: Reduce spawn rate after a child process exits due to
- unexpected poll or accept failure.
- trunk patch: http://svn.apache.org/viewvc?rev=1363183&view=rev
- 2.2.x patch: trunk patch works
- +1: trawick, jorton, rjung
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c?rev=1366515&r1=1366514&r2=1366515&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c Fri Jul 27 19:51:57 2012
@@ -614,7 +614,7 @@ static void child_main(int child_num_arg
ap_log_error(APLOG_MARK, APLOG_ERR, status,
ap_server_conf, "apr_pollset_poll: (listen)");
SAFE_ACCEPT(accept_mutex_off());
- clean_child_exit(1);
+ clean_child_exit(APEXIT_CHILDSICK);
}
/* We can always use pdesc[0], but sockets at position N
@@ -651,7 +651,7 @@ static void child_main(int child_num_arg
if (status == APR_EGENERAL) {
/* resource shortage or should-not-occur occured */
- clean_child_exit(1);
+ clean_child_exit(APEXIT_CHILDSICK);
}
else if (status != APR_SUCCESS) {
continue;