Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 14 Oct 2000 06:53:03 -0000
Message-ID: <20001014065303.20334.qmail@locus.apache.org>
From: rbb@locus.apache.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/main http_protocol.c

rbb         00/10/13 23:53:03

  Modified:    src/main http_protocol.c
  Log:
  Cleanup ap_get_client_block a bit.  All of the code that I am removing
  doesn't actually do anything useful, it was meant to remove all zero
  length buckets before trying to read from the brigade.  However, it is
  perfectly fine to not do this, and to just read those buckets along with
  the rest of them.
  
  Revision  Changes    Path
  1.172     +0 -30     apache-2.0/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
  retrieving revision 1.171
  retrieving revision 1.172
  diff -u -r1.171 -r1.172
  --- http_protocol.c	2000/10/14 06:21:38	1.171
  +++ http_protocol.c	2000/10/14 06:53:02	1.172
  @@ -2420,36 +2420,6 @@
   
           bb = ap_brigade_create(r->pool);
   
  -        do {
  -            if (AP_BRIGADE_EMPTY(bb)) {
  -                apr_getsocketopt(r->connection->client->bsock, APR_SO_TIMEOUT, 
  -                                 &timeout);
  -                apr_setsocketopt(r->connection->client->bsock, APR_SO_TIMEOUT,
  -                                 0);
  -                if (ap_get_brigade(r->input_filters, bb, 
  -                                   len_to_read) != APR_SUCCESS) {
  -                    /* if we actually fail here, we want to just return and
  -                     * stop trying to read data from the client.
  -                     */
  -                    apr_setsocketopt(r->connection->client->bsock, 
  -                                     APR_SO_TIMEOUT, timeout);
  -                    r->connection->keepalive = -1;
  -                    ap_brigade_destroy(bb);
  -                    return -1;
  -                }
  -                apr_setsocketopt(r->connection->client->bsock, APR_SO_TIMEOUT,
  -                                 timeout);
  -            }
  -            b = AP_BRIGADE_FIRST(bb);
  -            
  -            while (b->length == 0 && b != AP_BRIGADE_SENTINEL(bb)) {
  -                ap_bucket *e = b;
  -                b = AP_BUCKET_NEXT(e);
  -                AP_BUCKET_REMOVE(e);
  -                ap_bucket_destroy(e);
  -            }
  -        } while (AP_BRIGADE_EMPTY(bb));
  -
           total = 0;
           do {
               if (AP_BRIGADE_EMPTY(bb)) {