]>
Commit | Line | Data |
---|---|---|
61889e41 AM |
1 | --- httpd-2.2.24/os/unix/unixd.c~ 2011-02-14 21:18:20.000000000 +0100 |
2 | +++ httpd-2.2.24/os/unix/unixd.c 2013-04-09 15:56:56.967132150 +0200 | |
3 | @@ -650,6 +650,15 @@ | |
4 | return APR_EGENERAL; | |
5 | #else | |
6 | default: | |
7 | + /* If the socket has been closed in ap_close_listeners() | |
8 | + * by the restart/stop action, we may get EBADF. | |
9 | + * Do not print an error in this case. | |
10 | + */ | |
11 | + if (!lr->active) { | |
12 | + ap_log_error(APLOG_MARK, APLOG_DEBUG, status, ap_server_conf, | |
13 | + "apr_socket_accept failed for inactive listener"); | |
14 | + return status; | |
15 | + } | |
16 | ap_log_error(APLOG_MARK, APLOG_ERR, status, ap_server_conf, | |
17 | "apr_socket_accept: (client socket)"); | |
18 | return APR_EGENERAL; |