Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 26 Jul 2001 16:05:36 -0000
Message-ID: <20010726160536.77524.qmail@icarus.apache.org>
From: wrowe@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/http http_protocol.c

wrowe       01/07/26 09:05:36

  Modified:    modules/http http_protocol.c
  Log:
    This patch should address input buffering, requesting only as much from
    the client as the ap_get_client_block() buffer is prepared to accept.
  
  Revision  Changes    Path
  1.334     +4 -1      httpd-2.0/modules/http/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_protocol.c,v
  retrieving revision 1.333
  retrieving revision 1.334
  diff -u -r1.333 -r1.334
  --- http_protocol.c	2001/07/26 15:53:15	1.333
  +++ http_protocol.c	2001/07/26 16:05:36	1.334
  @@ -1435,8 +1435,11 @@
   
       do {
           if (APR_BRIGADE_EMPTY(bb)) {
  +            apr_size_t asmuch = bufsiz;
  +            if (r->remaining < asmuch)
  +                asmuch = (apr_size_t)r->remaining;
               if (ap_get_brigade(r->input_filters, bb, AP_MODE_BLOCKING,
  -                               &r->remaining) != APR_SUCCESS) {
  +                               &asmuch) != APR_SUCCESS) {
                   /* if we actually fail here, we want to just return and
                    * stop trying to read data from the client.
                    */