summaryrefslogtreecommitdiffstats
path: root/server/listen.c
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2004-02-04 15:12:06 +0100
committerJeff Trawick <trawick@apache.org>2004-02-04 15:12:06 +0100
commitb0442bb41b8c13d16e6c3937090f5281d2176560 (patch)
tree045130deaa8a257eb43404fbfcb0de5d9be68fae /server/listen.c
parentRe-synch with 2.0 stable branch after backport. (diff)
downloadapache2-b0442bb41b8c13d16e6c3937090f5281d2176560.tar.xz
apache2-b0442bb41b8c13d16e6c3937090f5281d2176560.zip
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
Diffstat (limited to 'server/listen.c')
-rw-r--r--server/listen.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/server/listen.c b/server/listen.c
index 12f7d49d7e..ebb2817c40 100644
--- a/server/listen.c
+++ b/server/listen.c
@@ -199,8 +199,14 @@ 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