From: Jim Jagielski <jim@apache.org>
Date: Fri, 24 Jan 2014 18:53:15 +0000 (+0000)
Subject: If we try to set this on a UDS socket, don't log the error.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d721b756ad4e71f3de8028f4c6f034b6eb6be6e3;p=thirdparty%2Fapache%2Fhttpd.git

If we try to set this on a UDS socket, don't log the error.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1561109 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/core.c b/server/core.c
index ff7c43dce0e..c542de63274 100644
--- a/server/core.c
+++ b/server/core.c
@@ -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 *c, void *csd)
      * 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
          */