httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jeff Trawick <trawi...@bellsouth.net>
Subject Re: cvs commit: apache-2.0/src/main http_core.c http_protocol.c
Date Mon, 06 Nov 2000 18:03:33 GMT
rbb@locus.apache.org writes:

> rbb         00/11/03 17:30:38
> 
>   Log:
>   Clean up blocking and non-blocking reads from buckets.  The only bucket
>   that works correctly right now is sockets, but pipes are coming next.
>   This also makes the http_header_filter do AP_MODE_PEEK correctly.
>   
>   Index: ap_buckets.c
>   ===================================================================
>   RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets.c,v
>   retrieving revision 1.28
>   retrieving revision 1.29
>   diff -u -r1.28 -r1.29
>   --- ap_buckets.c	2000/10/23 19:21:47	1.28
>   +++ ap_buckets.c	2000/11/04 01:30:26	1.29
>   @@ -130,7 +130,7 @@
>        AP_BRIGADE_FOREACH(e, b) {
>    	if (nvec-- == 0)
>                break;
>   -	ap_bucket_read(e, (const char **)&vec->iov_base, &iov_len, 0);
>   +	ap_bucket_read(e, (const char **)&vec->iov_base, &iov_len, AP_NONBLOCK_READ);
>            vec->iov_len = iov_len; /* set indirectly in case size differs */
>    	++vec;
>        }

Perhaps this function (ap_brigade_to_iovec()) needs the ap_read_type
parameter?  Also, we can't keep going once ap_bucket_read() returns
APR_EAGAIN... if we do, we get data out of order...
-- 
Jeff Trawick | trawick@ibm.net | PGP public key at web site:
     http://www.geocities.com/SiliconValley/Park/9289/
          Born in Roswell... married an alien...

Mime
View raw message