From: Martin Kraemer <martin@apache.org>
Date: Thu, 9 Jan 2003 09:24:10 +0000 (+0000)
Subject: Try to set REUSEADDR even on BS2000 (and ignore errors in older
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e987b9c76eb971aeb71c24775f5e007c9848d8ef;p=thirdparty%2Fapache%2Fhttpd.git

Try to set REUSEADDR even on BS2000 (and ignore errors in older
versions of the TCP stack)


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

diff --git a/src/main/http_main.c b/src/main/http_main.c
index 0205aa0682a..967ce941619 100644
--- a/src/main/http_main.c
+++ b/src/main/http_main.c
@@ -3634,8 +3634,8 @@ static int make_sock(pool *p, const struct sockaddr_in *server)
 #endif /* TPF */
 #endif
 
-#ifndef _OSD_POSIX
     if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *) &one, sizeof(int)) < 0) {
+#ifndef _OSD_POSIX
 	ap_log_error(APLOG_MARK, APLOG_CRIT, server_conf,
 		    "make_sock: for %s, setsockopt: (SO_REUSEADDR)", addr);
 #ifdef BEOS
@@ -3645,8 +3645,8 @@ static int make_sock(pool *p, const struct sockaddr_in *server)
 #endif
 	ap_unblock_alarms();
 	exit(1);
-    }
 #endif /*_OSD_POSIX*/
+    }
     one = 1;
 #if defined(SO_KEEPALIVE) && !defined(MPE)
     if (setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, (char *) &one, sizeof(int)) < 0) {