diff options
| author | Remi Collet <fedora@famillecollet.com> | 2012-09-20 08:30:41 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2012-09-20 08:30:41 +0200 |
| commit | a28d244176270bc2881b6d48f9c41d3cb73108e4 (patch) | |
| tree | 95955820a68bbdee13ab586e032a51418716b42c /httpd-2.4.2-r1387633.patch | |
| parent | 59369597b5a0f67f4f6a0e3101f1e36b04acc6cd (diff) | |
httpd: sync with rawhide
Diffstat (limited to 'httpd-2.4.2-r1387633.patch')
| -rw-r--r-- | httpd-2.4.2-r1387633.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/httpd-2.4.2-r1387633.patch b/httpd-2.4.2-r1387633.patch new file mode 100644 index 0000000..3fc0143 --- /dev/null +++ b/httpd-2.4.2-r1387633.patch @@ -0,0 +1,23 @@ +# ./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); + } + |