httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@covalent.net
Subject Re: cvs commit: apache-2.0/src/main http_core.c
Date Tue, 10 Oct 2000 02:41:58 GMT

-1  That is wrong.  The code to look for LF is 100% correct.  The part
that was the ugly hack was the duplicated ASCII_LF macro.

Ryan

On 10 Oct 2000 trawick@locus.apache.org wrote:

> trawick     00/10/09 19:10:42
> 
>   Modified:    src/main http_core.c
>   Log:
>   core_input_filter():
>     remove old code which looked for LF
>     return apr_status_t value instead of length
>   
>   Revision  Changes    Path
>   1.158     +4 -16     apache-2.0/src/main/http_core.c
>   
>   Index: http_core.c
>   ===================================================================
>   RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
>   retrieving revision 1.157
>   retrieving revision 1.158
>   diff -u -r1.157 -r1.158
>   --- http_core.c	2000/10/09 23:11:21	1.157
>   +++ http_core.c	2000/10/10 02:10:42	1.158
>   @@ -3305,12 +3305,8 @@
>    
>    static int core_input_filter(ap_filter_t *f, ap_bucket_brigade *b)
>    {
>   -/* XXX this needs to be moved to a common header file, but this is an ugly
>   - * hack just for today.
>   - */
>   -#define ASCII_LF '\012'
>        char *buff;
>   -    apr_ssize_t length = HUGE_STRING_LEN, templen = 0;
>   +    apr_ssize_t length = HUGE_STRING_LEN;
>        apr_socket_t *csock = NULL;
>        apr_status_t rv;
>        ap_bucket *e;
>   @@ -3322,17 +3318,11 @@
>        rv = apr_recv(csock, buff, &length);
>        if (rv == APR_SUCCESS) {
>            if (length > 0) {
>   -            templen = length - 1;
>   -            while (buff[templen] != ASCII_LF) {
>   -                rv = apr_recv(csock, buff + templen + 1, &length);
>   -                templen += length;
>   -            }
>   -                 
>                /* This should probably be a pool bucket, but using a transient is 
>                 * actually okay here too.  We know the pool we are using will always

>                 * be available as long as the connection is open.
>                 */
>   -            e = ap_bucket_create_transient(buff, templen + 1);
>   +            e = ap_bucket_create_transient(buff, length);
>                AP_BRIGADE_INSERT_TAIL(b, e);
>            }
>            else {
>   @@ -3342,11 +3332,9 @@
>            }
>        }
>        else {
>   -        /* XXX need to trigger error processing */
>   -        /* leave the brigade empty for now; return error code
>   -         * in the future */
>   +        return rv;
>        }
>   -    return templen;
>   +    return APR_SUCCESS;
>    }
>    /* Default filter.  This filter should almost always be used.  Its only job
>     * is to send the headers if they haven't already been sent, and then send
>   
>   
>   
> 


_______________________________________________________________________________
Ryan Bloom                        	rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------



Mime
View raw message