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 Wed, 11 Oct 2000 17:37:23 GMT
trawick     00/10/11 10:37:23

  Modified:    src/main http_protocol.c
  Log:
  In getline() and ap_get_client_block(), use ap_bucket_destroy()
  instead of bucket->destroy().  bucket->destroy() wasn't being
  called correctly and also we were leaking the storage for the
  bucket itself since bucket->destroy() doesn't free the ap_bucket.
  Submitted by:	Ryan Bloom, Jeff Trawick
  
  Revision  Changes    Path
  1.156     +4 -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.155
  retrieving revision 1.156
  diff -u -r1.155 -r1.156
  --- http_protocol.c	2000/10/10 17:04:19	1.155
  +++ http_protocol.c	2000/10/11 17:37:22	1.156
  @@ -1007,7 +1007,7 @@
       while (1) {
           while (e->length == 0) {
               AP_BUCKET_REMOVE(e);
  -            e->destroy(e);
  +            ap_bucket_destroy(e);
   
               ap_get_brigade(c->input_filters, b);
               if (!AP_BRIGADE_EMPTY(b)) {
  @@ -1034,7 +1034,7 @@
               apr_cpystrn(pos, temp, length + 1);
   	    
               AP_BUCKET_REMOVE(e);
  -            e->destroy(e);
  +            ap_bucket_destroy(e);
           }
           c->input_data = b;
           e = AP_BRIGADE_FIRST(b); 
  @@ -2467,7 +2467,7 @@
                   ap_bucket *e = b;
                   b = AP_BUCKET_NEXT(e);
                   AP_BUCKET_REMOVE(e);
  -                e->destroy(e);
  +                ap_bucket_destroy(e);
               }
           } while (AP_BRIGADE_EMPTY(r->connection->input_data));
   
  @@ -2481,7 +2481,7 @@
   
           memcpy(buffer, tempbuf, len_to_read);
           AP_BUCKET_REMOVE(b);
  -        b->destroy(b);
  +        ap_bucket_destroy(b);
   
           r->read_length += len_to_read;
           r->remaining -= len_to_read;
  
  
  

Mime
View raw message