From: Paul Querna <pquerna@apache.org>
Date: Wed, 18 Aug 2004 02:52:15 +0000 (+0000)
Subject: Backport of the 'httpready' Accept Filter changes from 2.1-dev
X-Git-Tag: STRIKER_2_0_51_RC1^2~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee25ba16856dc362d42a5bcb74363633c1d37962;p=thirdparty%2Fapache%2Fhttpd.git

Backport of the 'httpready' Accept Filter changes from 2.1-dev

Reviewed by: Justin Erenkrantz, Jeff Trawick


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

diff --git a/CHANGES b/CHANGES
index 087c6724a47..d1702bedd1f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.51
 
+  *) Use the higher performing 'httpready' Accept Filter on all platforms 
+     except FreeBSD < 4.1.1. [Paul Querna]
+
   *) mod_usertrack: Escape the cookie name before pasting into the
      regexp.  [André Malo]
 
diff --git a/STATUS b/STATUS
index 33feac2c214..d32c32a9f86 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/08/18 02:35:05 $]
+Last modified at [$Date: 2004/08/18 02:52:14 $]
 
 Release:
 
@@ -384,10 +384,6 @@ PATCHES TO BACKPORT FROM 2.1
       which integrates the two rounds of changes)
       +1 concept: trawick, nd
 
-    * Use the httpready accept filter
-        server/listen.c: r1.96
-      +1: trawick, pquerna, jerenkrantz
-
     * Work around RedHat bug 82359 (openssl requires pkg-config):
         http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=82369
       Patch (2.1 version already committed, 2.0 has diff OpenSSL config logic):
diff --git a/server/listen.c b/server/listen.c
index 28933e14089..0cba19d6e13 100644
--- a/server/listen.c
+++ b/server/listen.c
@@ -162,7 +162,13 @@ static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server)
 
 #if APR_HAS_SO_ACCEPTFILTER
 #ifndef ACCEPT_FILTER_NAME
+#define ACCEPT_FILTER_NAME "httpready"
+#ifdef __FreeBSD_version
+#if __FreeBSD_version < 411000 /* httpready was broken before 4.1.1 */
+#undef ACCEPT_FILTER_NAME
 #define ACCEPT_FILTER_NAME "dataready"
+#endif
+#endif
 #endif
     apr_socket_accept_filter(s, ACCEPT_FILTER_NAME, "");
 #endif