diff options
Diffstat (limited to 'httpd-2.4.3-r1387633+.patch')
| -rw-r--r-- | httpd-2.4.3-r1387633+.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/httpd-2.4.3-r1387633+.patch b/httpd-2.4.3-r1387633+.patch new file mode 100644 index 0000000..b09b338 --- /dev/null +++ b/httpd-2.4.3-r1387633+.patch @@ -0,0 +1,27 @@ +# ./pullrev.sh 1387633 1392850 + +http://svn.apache.org/viewvc?view=revision&revision=1387633 +http://svn.apache.org/viewvc?view=revision&revision=1392850 + +--- httpd-2.4.3/server/mpm/prefork/prefork.c ++++ httpd-2.4.3/server/mpm/prefork/prefork.c +@@ -564,9 +564,16 @@ + + status = apr_pollset_add(pollset, &pfd); + if (status != APR_SUCCESS) { +- ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf, APLOGNO(00157) +- "Couldn't add listener to pollset; check system or user limits"); +- clean_child_exit(APEXIT_CHILDSICK); ++ /* If the child processed a SIGWINCH before setting up the ++ * pollset, this error path is expected and harmless, ++ * since the listener fd was already closed; so don't ++ * pollute the logs in that case. */ ++ if (!die_now) { ++ ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf, APLOGNO(00157) ++ "Couldn't add listener to pollset; check system or user limits"); ++ clean_child_exit(APEXIT_CHILDSICK); ++ } ++ clean_child_exit(0); + } + + lr->accept_func = ap_unixd_accept; |