httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r933657 - /httpd/httpd/trunk/os/unix/unixd.c
Date Tue, 13 Apr 2010 14:58:03 GMT
Author: trawick
Date: Tue Apr 13 14:58:03 2010
New Revision: 933657

URL: http://svn.apache.org/viewvc?rev=933657&view=rev
Log:
generalize the existing (r589761) platform- and errno-specific
logic to suppress an error message if accept() fails after the
socket has been marked inactive

a message will still be logged, but at debug level instead of error

PR: 49058

Modified:
    httpd/httpd/trunk/os/unix/unixd.c

Modified: httpd/httpd/trunk/os/unix/unixd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/unix/unixd.c?rev=933657&r1=933656&r2=933657&view=diff
==============================================================================
--- httpd/httpd/trunk/os/unix/unixd.c (original)
+++ httpd/httpd/trunk/os/unix/unixd.c Tue Apr 13 14:58:03 2010
@@ -416,14 +416,15 @@ AP_DECLARE(apr_status_t) ap_unixd_accept
 #endif /*ENETDOWN*/
 
         default:
-#ifdef _OSD_POSIX /* Possibly on other platforms too */
             /* If the socket has been closed in ap_close_listeners()
              * by the restart/stop action, we may get EBADF.
              * Do not print an error in this case.
              */
-            if (!lr->active && status == EBADF)
+            if (!lr->active) {
+                ap_log_error(APLOG_MARK, APLOG_DEBUG, status, ap_server_conf,
+                             "apr_socket_accept failed for inactive listener");
                 return status;
-#endif
+            }
             ap_log_error(APLOG_MARK, APLOG_ERR, status, ap_server_conf,
                          "apr_socket_accept: (client socket)");
             return APR_EGENERAL;



Mime
View raw message