svn commit: r1561109 - /httpd/httpd/trunk/server/core.c

[ji...@apache.org]

Author: jim
Date: Fri Jan 24 18:53:15 2014
New Revision: 1561109

URL: http://svn.apache.org/r1561109
Log:
If we try to set this on a UDS socket, don't log the error.

Modified:
    httpd/httpd/trunk/server/core.c

Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=1561109&r1=1561108&r2=1561109&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Fri Jan 24 18:53:15 2014
@@ -49,6 +49,7 @@
 #include "mod_proxy.h"
 #include "ap_listen.h"
 #include "ap_provider.h"
+#include "apr_version.h"
 
 #include "mod_so.h" /* for ap_find_loaded_module_symbol */
 
@@ -4904,7 +4905,12 @@ static int core_pre_connection(conn_rec 
      * problem with simple HTTP.)
      */
     rv = apr_socket_opt_set(csd, APR_TCP_NODELAY, 1);
-    if (rv != APR_SUCCESS && rv != APR_ENOTIMPL) {
+    if (rv != APR_SUCCESS
+        && rv != APR_ENOTIMPL
+#if APR_VERSION_AT_LEAST(1,5,1)
+        && rv != APR_EOPNOTSUPP
+#endif
+        ) {
         /* expected cause is that the client disconnected already,
          * hence the debug level
          */