From: Dirk-Willem van Gulik <dirkx@apache.org>
Date: Fri, 13 Jul 2001 21:25:47 +0000 (+0000)
Subject: Added the ENOPROTOOPT ent suggested by Ryan. Although
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a4116a89c7ac9964bfdceb59c432357fe601066;p=thirdparty%2Fapache%2Fhttpd.git

Added the ENOPROTOOPT ent suggested by Ryan. Although
we propably need to hunt around on FreeBSD; as some
intermediate releases might have given a different Eno.
But then again those where on the current track. So they
are safe to ignore.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@89549 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/main/http_main.c b/src/main/http_main.c
index 7536262733f..07047e10e20 100644
--- a/src/main/http_main.c
+++ b/src/main/http_main.c
@@ -3450,8 +3450,8 @@ static int make_sock(pool *p, const struct sockaddr_in *server)
 	struct accept_filter_arg af = {
 	    ACCEPT_FILTER_NAME, ""
 	};
-	if (setsockopt(s, SOL_SOCKET, SO_ACCEPTFILTER, &af, sizeof(af)) < 0
-	    && errno != ENOENT) {
+	if ((setsockopt(s, SOL_SOCKET, SO_ACCEPTFILTER, &af, sizeof(af)) < 0)
+            && (errno != ENOENT) && (errno != ENOPROTOOPT)) {
 	    ap_log_error(APLOG_MARK, APLOG_WARNING, server_conf,
 			 "make_sock: for %s, setsockopt: (SO_ACCEPTFILTER)",
 			 addr);