httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/http http_protocol.c
Date Mon, 19 Mar 2001 21:54:58 GMT
trawick     01/03/19 13:54:58

  Modified:    .        CHANGES
               server   protocol.c
               modules/http http_protocol.c
  Log:
  Handle ap_discard_request_body() being called more than once.
  
  Add a debug assertion to verify that c->remain is zero when a new
  request starts.  ap_http_filter() does the wrong thing otherwise.
  
  Revision  Changes    Path
  1.138     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.137
  retrieving revision 1.138
  diff -u -r1.137 -r1.138
  --- CHANGES	2001/03/19 16:07:56	1.137
  +++ CHANGES	2001/03/19 21:54:54	1.138
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.15-dev
   
  +  *) Handle ap_discard_request_body() being called more than once.
  +     [Greg Ames, Jeff Trawick]
  +
     *) Get rid of an inadvertent close of file descriptor 2 in
        mod_mime_magic.  [Greg Ames, Jeff Trawick]
   
  
  
  
  1.8       +2 -0      httpd-2.0/server/protocol.c
  
  Index: protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/protocol.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- protocol.c	2001/03/18 02:33:22	1.7
  +++ protocol.c	2001/03/19 21:54:56	1.8
  @@ -844,6 +844,8 @@
       const char *expect;
       int access_status;
   
  +    AP_DEBUG_ASSERT(conn->remain == 0);
  +
       apr_pool_create(&p, conn->pool);
       r = apr_pcalloc(p, sizeof(request_rec));
       r->pool            = p;
  
  
  
  1.309     +4 -2      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.308
  retrieving revision 1.309
  diff -u -r1.308 -r1.309
  --- http_protocol.c	2001/03/16 07:37:12	1.308
  +++ http_protocol.c	2001/03/19 21:54:57	1.309
  @@ -1450,8 +1450,10 @@
   {
       int rv;
   
  -    if ((rv = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK)))
  -        return rv;
  +    if (r->read_length == 0) { /* if not read already */
  +        if ((rv = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK)))
  +            return rv;
  +    }
   
       /* In order to avoid sending 100 Continue when we already know the
        * final response status, and yet not kill the connection if there is
  
  
  

Mime
View raw message