You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by pq...@apache.org on 2004/08/18 04:52:15 UTC
cvs commit: httpd-2.0/server listen.c
pquerna 2004/08/17 19:52:15
Modified: . Tag: APACHE_2_0_BRANCH CHANGES STATUS
server Tag: APACHE_2_0_BRANCH listen.c
Log:
Backport of the 'httpready' Accept Filter changes from 2.1-dev
Reviewed by: Justin Erenkrantz, Jeff Trawick
Revision Changes Path
No revision
No revision
1.988.2.322 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.321
retrieving revision 1.988.2.322
diff -u -r1.988.2.321 -r1.988.2.322
--- CHANGES 17 Aug 2004 19:56:33 -0000 1.988.2.321
+++ CHANGES 18 Aug 2004 02:52:13 -0000 1.988.2.322
@@ -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]
1.751.2.987 +1 -5 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.986
retrieving revision 1.751.2.987
diff -u -r1.751.2.986 -r1.751.2.987
--- STATUS 18 Aug 2004 02:35:05 -0000 1.751.2.986
+++ STATUS 18 Aug 2004 02:52:14 -0000 1.751.2.987
@@ -384,10 +384,6 @@
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):
No revision
No revision
1.83.2.9 +6 -0 httpd-2.0/server/listen.c
Index: listen.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/listen.c,v
retrieving revision 1.83.2.8
retrieving revision 1.83.2.9
diff -u -r1.83.2.8 -r1.83.2.9
--- listen.c 25 Mar 2004 02:32:54 -0000 1.83.2.8
+++ listen.c 18 Aug 2004 02:52:15 -0000 1.83.2.9
@@ -162,7 +162,13 @@
#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