svn commit: r1387633 - /httpd/httpd/trunk/server/mpm/prefork/prefork.c

[jo...@apache.org]

Author: jorton
Date: Wed Sep 19 15:09:35 2012
New Revision: 1387633

URL: http://svn.apache.org/viewvc?rev=1387633&view=rev
Log:
* server/mpm/prefork/prefork.c (child_main): Don't log errors for an
  apr_pollset_add() failure if a graceful-stop has been signalled.

Modified:
    httpd/httpd/trunk/server/mpm/prefork/prefork.c

Modified: httpd/httpd/trunk/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/prefork.c?rev=1387633&r1=1387632&r2=1387633&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Wed Sep 19 15:09:35 2012
@@ -564,8 +564,14 @@ static void child_main(int child_num_arg
 
         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);
         }