24 lines
1020 B
Diff
24 lines
1020 B
Diff
|
# ./pullrev.sh 1387633
|
||
|
|
|
||
|
|
http://svn.apache.org/viewvc?view=revision&revision=1387633
|
||
|
|
|
||
|
|
--- httpd-2.4.2/server/mpm/prefork/prefork.c
|
||
|
|
+++ httpd-2.4.2/server/mpm/prefork/prefork.c
|
||
|
|
@@ -564,8 +564,14 @@
|
||
|
|
|
||
|
|
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");
|
||
|
|
+ /* 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);
|
||
|
|
}
|
||
|
|
|