FreeBSD: Use the httpready accept filter instead of dataready on

newer levels of the OS.

Submitted by: Paul Querna <chip force-elite.com>
Reviewed by:  Jeff Trawick

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

diff --git a/CHANGES b/CHANGES
index 753a5ea45f678208ac3223c8b6f83436d3b69f46..3dc91bf2b3a67244f06aa722fc3f258f41445d66 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) FreeBSD: Use the httpready accept filter instead of dataready on
+     newer levels of the OS.  [Paul Querna <chip force-elite.com>]
+
   *) Delete some make-generated files in the server directory during 
      "make clean" processing.  PR 26552.  [Jeff Trawick]
 

diff --git a/server/listen.c b/server/listen.c
index 12f7d49d7e4687ab788ed0313ae42625f471bafe..ebb2817c4039efe6c8fabbd81f0a652fb20f7dc3 100644 (file)
--- a/server/listen.c
+++ b/server/listen.c
@@ -199,7 +199,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 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