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 7e2d153d2028b6cafb1d8c09c9d5700fdd3ff90b..188dc086006908cde2c9cddf9a22a9f9ebd0a5ec 100644 (file)
--- 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 663c9afc539996c3ab16d4c117a85ea0f3c941aa..004e498ef93cb21690d8fd8baea81598eb233f69 100644 (file)
--- 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.