From: Tony Finch <fanf@apache.org>
Date: Mon, 14 Jan 2002 04:49:44 +0000 (+0000)
Subject: Following taunts from Alfred Perlstein on IRC, use "httpready"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d3d30a90e2f473f01a0b8cc5305c61d67e317ff;p=thirdparty%2Fapache%2Fhttpd.git

Following taunts from Alfred Perlstein on IRC, use "httpready"
accept filter rather than "dataready" on FreeBSD after 4.1.1-RELEASE
where it works correctly.


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

diff --git a/src/CHANGES b/src/CHANGES
index 7e2d153d202..188dc086006 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 1.3.23
 
+  *) Use "httpready" accept filter rather than "dataready" on
+     FreeBSD after 4.1.1-RELEASE where it works correctly.
+     [Tony Finch]
+
   *) Fix incorrect "Content-Length" header in the 416 "range not
      satisfiable" response. [Joe Orton <joe@manyfish.co.uk>]
 
diff --git a/src/main/http_main.c b/src/main/http_main.c
index 663c9afc539..004e498ef93 100644
--- a/src/main/http_main.c
+++ b/src/main/http_main.c
@@ -3728,8 +3728,14 @@ static int make_sock(pool *p, const struct sockaddr_in *server)
 #ifdef SO_ACCEPTFILTER
     if (ap_acceptfilter) {
 #ifndef ACCEPT_FILTER_NAME
+#define ACCEPT_FILTER_NAME "httpready"
+#ifdef __FreeBSD_version
+#if __FreeBSD_version < 411000 /* httpready broken before 4.1.1 */
+#undef ACCEPT_FILTER_NAME
 #define ACCEPT_FILTER_NAME "dataready"
 #endif
+#endif
+#endif /* ! ACCEPT_FILTER_NAME */
 	/*
 	 * See htdocs/manual/misc/perf-bsd44.html for a discussion of
 	 * how to enable this feature and various issues with it.