diff options
| author | Remi Collet <fedora@famillecollet.com> | 2012-10-05 18:48:49 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2012-10-05 18:48:49 +0200 |
| commit | 3aad8e0ac5256cafbdaeaa17653e700ba8ead0a9 (patch) | |
| tree | 56a2c98235930abcc0d94f1261b6d2ee2b15f55b /httpd-2.4.2-r1387633.patch | |
| parent | a28d244176270bc2881b6d48f9c41d3cb73108e4 (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, 0 insertions, 23 deletions
diff --git a/httpd-2.4.2-r1387633.patch b/httpd-2.4.2-r1387633.patch deleted file mode 100644 index 3fc0143..0000000 --- a/httpd-2.4.2-r1387633.patch +++ /dev/null @@ -1,23 +0,0 @@ -# ./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); - } - |