apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwool...@apache.org
Subject cvs commit: apr-util/buckets apr_buckets_file.c apr_buckets_pipe.c
Date Fri, 29 Mar 2002 22:29:19 GMT
jwoolley    02/03/29 14:29:19

  Modified:    buckets  apr_buckets_file.c apr_buckets_pipe.c
  Log:
  Whoops, these changes were missed yesterday.  The data should not be
  copied in these cases, as the space was already allocated with
  apr_bucket_alloc.  0 used to mean "don't copy" ... unfortunately now it's
  synonymous with NULL, which means DO copy.  Oh well, we didn't have much
  choice.
  
  Revision  Changes    Path
  1.66      +1 -1      apr-util/buckets/apr_buckets_file.c
  
  Index: apr_buckets_file.c
  ===================================================================
  RCS file: /home/cvs/apr-util/buckets/apr_buckets_file.c,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -d -u -r1.65 -r1.66
  --- apr_buckets_file.c	29 Mar 2002 08:12:08 -0000	1.65
  +++ apr_buckets_file.c	29 Mar 2002 22:29:19 -0000	1.66
  @@ -165,7 +165,7 @@
        * Change the current bucket to refer to what we read,
        * even if we read nothing because we hit EOF.
        */
  -    apr_bucket_heap_make(e, buf, *len, 0);
  +    apr_bucket_heap_make(e, buf, *len, apr_bucket_free);
   
       /* If we have more to read from the file, then create another bucket */
       if (filelength > 0) {
  
  
  
  1.46      +1 -1      apr-util/buckets/apr_buckets_pipe.c
  
  Index: apr_buckets_pipe.c
  ===================================================================
  RCS file: /home/cvs/apr-util/buckets/apr_buckets_pipe.c,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -d -u -r1.45 -r1.46
  --- apr_buckets_pipe.c	29 Mar 2002 08:12:08 -0000	1.45
  +++ apr_buckets_pipe.c	29 Mar 2002 22:29:19 -0000	1.46
  @@ -96,7 +96,7 @@
       if (*len > 0) {
           apr_bucket_heap *h;
           /* Change the current bucket to refer to what we read */
  -        a = apr_bucket_heap_make(a, buf, *len, 0);
  +        a = apr_bucket_heap_make(a, buf, *len, apr_bucket_free);
           h = a->data;
           h->alloc_len = APR_BUCKET_BUFF_SIZE; /* note the real buffer size */
           *str = buf;
  
  
  

Mime
View raw message