diff options
| author | Joe Orton <jorton@apache.org> | 2012-09-19 17:09:35 +0200 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2012-09-19 17:09:35 +0200 |
| commit | ca557acd34d4ebc52b387a2c21f1f7a280663cd7 (patch) | |
| tree | 5b892bd9488b8dad96a3768b385c09338588311d /server/mpm/prefork/prefork.c | |
| parent | This is httpd 2.5, not 2.3, and we do not support Windows 9x/ME anymore, so l... (diff) | |
| download | apache2-ca557acd34d4ebc52b387a2c21f1f7a280663cd7.tar.xz apache2-ca557acd34d4ebc52b387a2c21f1f7a280663cd7.zip | |
* server/mpm/prefork/prefork.c (child_main): Don't log errors for an
apr_pollset_add() failure if a graceful-stop has been signalled.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1387633 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | server/mpm/prefork/prefork.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index d0cf59b4cb..0c6254e1ec 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -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); } |