Commit 9edbd378 authored by Paul Querna's avatar Paul Querna
Browse files

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
parent 37c8dfe2

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
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]










































STATUS



+1
−5



























Changes for STATUS: 1 added line, 5 removed lines.



Original line number
Diff line number
Diff line









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):


































server/listen.c



+6
−0



























Changes for server/listen.c: 6 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -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