Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 11689 invoked by uid 500); 9 Jan 2003 09:24:13 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 11673 invoked by uid 500); 9 Jan 2003 09:24:13 -0000 Delivered-To: apmail-apache-1.3-cvs@apache.org Date: 9 Jan 2003 09:24:11 -0000 Message-ID: <20030109092411.73108.qmail@icarus.apache.org> From: martin@apache.org To: apache-1.3-cvs@apache.org Subject: cvs commit: apache-1.3/src/main http_main.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N martin 2003/01/09 01:24:11 Modified: src/main http_main.c Log: Try to set REUSEADDR even on BS2000 (and ignore errors in older versions of the TCP stack) Revision Changes Path 1.599 +2 -2 apache-1.3/src/main/http_main.c Index: http_main.c =================================================================== RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v retrieving revision 1.598 retrieving revision 1.599 diff -u -r1.598 -r1.599 --- http_main.c 17 Dec 2002 19:06:08 -0000 1.598 +++ http_main.c 9 Jan 2003 09:24:10 -0000 1.599 @@ -3634,8 +3634,8 @@ #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 @@ #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) {