httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/main http_protocol.c
Date Tue, 17 Oct 2000 17:53:17 GMT
trawick     00/10/17 10:53:15

  Modified:    src/main http_protocol.c
  Log:
  http_filter():
    get rid of an unnecessary condition where we set ctx->b to NULL;
    it was already NULL
  
  ap_get_client_block():
    "fix" the pool for the brigade used by ap_get_client_block() to
    save its state; this allows pipelined requests to work
  
  Revision  Changes    Path
  1.185     +9 -4      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.184
  retrieving revision 1.185
  diff -u -r1.184 -r1.185
  --- http_protocol.c	2000/10/17 17:26:46	1.184
  +++ http_protocol.c	2000/10/17 17:53:09	1.185
  @@ -1027,9 +1027,6 @@
               }
               e = AP_BUCKET_NEXT(e);
           }
  -        if (e == AP_BRIGADE_SENTINEL(b)) {
  -            ctx->b = NULL;
  -        }
           if (f->c->remain == 0) {
               ap_bucket *eos = ap_bucket_create_eos();
                   
  @@ -2477,7 +2474,15 @@
       ap_bucket_brigade *bb = conf->bb;
   
       if (!bb) {
  -        conf->bb = bb = ap_brigade_create(r->pool);
  +        /* XXX Yes, the pool for this brigade looks funky.  Right now it is
  +         * allocated from the connection pool instead of the request pool 
  +         * because HTTP_IN will sometimes split one of these brigades, with
  +         * the second part of the brigade holding data belonging to another 
  +         * request.  Since AP_BRIGADE_SPLIT() uses the same pool as the 
  +         * original brigade, we need to use a pool that won't be cleaned up 
  +         * until any subsequent requests on this connection are done.
  +         */
  +        conf->bb = bb = ap_brigade_create(r->connection->pool);
       }
   
       do {
  
  
  

Mime
View raw message