httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/server core.c protocol.c util_filter.c
Date Wed, 13 Jun 2001 13:44:41 GMT
rbb         01/06/13 06:44:41

  Modified:    include  util_filter.h
               modules/filters mod_include.c
               modules/http http_protocol.c
               server   core.c protocol.c util_filter.c
  Log:
  Add a pool to the ap_save_brigade prototype.  This removes a todo from
  the comments that is really necessary before the setaside stuff will
  work properly.
  
  Revision  Changes    Path
  1.55      +2 -1      httpd-2.0/include/util_filter.h
  
  Index: util_filter.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/util_filter.h,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -d -b -w -u -r1.54 -r1.55
  --- util_filter.h	2001/06/08 11:00:03	1.54
  +++ util_filter.h	2001/06/13 13:44:34	1.55
  @@ -378,9 +378,10 @@
    *             new bucket brigade is returned in this location.
    * @param b The bucket brigade to save aside.  This brigade is always empty
    *          on return
  + * @param p Ensure that all data in the brigade lives as long as this pool
    */
   AP_DECLARE(apr_status_t) ap_save_brigade(ap_filter_t *f, apr_bucket_brigade **save_to,
  -                                         apr_bucket_brigade **b);    
  +                                         apr_bucket_brigade **b, apr_pool_t *p);    
   
   /**
    * Flush function for apr_brigade_* calls.  This calls ap_pass_brigade
  
  
  
  1.111     +1 -1      httpd-2.0/modules/filters/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -d -b -w -u -r1.110 -r1.111
  --- mod_include.c	2001/06/06 12:48:45	1.110
  +++ mod_include.c	2001/06/13 13:44:36	1.111
  @@ -2620,7 +2620,7 @@
               }
                              /* Set aside tag, pass pre-tag... */
               tag_and_after = apr_brigade_split(*bb, ctx->head_start_bucket);
  -            ap_save_brigade(f, &ctx->ssi_tag_brigade, &tag_and_after);
  +            ap_save_brigade(f, &ctx->ssi_tag_brigade, &tag_and_after, r->pool);
               ap_pass_brigade(f->next, *bb);
               ctx->bytes_parsed = 0;
           }
  
  
  
  1.325     +1 -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.324
  retrieving revision 1.325
  diff -u -d -b -w -u -r1.324 -r1.325
  --- http_protocol.c	2001/06/06 19:30:49	1.324
  +++ http_protocol.c	2001/06/13 13:44:37	1.325
  @@ -2282,7 +2282,7 @@
        * we SHOULD return the data in the same order it was requested. 
        */
       if (!APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) {
  -        ap_save_brigade(f, &ctx->bb, &bb);
  +        ap_save_brigade(f, &ctx->bb, &bb, r->pool);
           return APR_SUCCESS;
       }
   
  
  
  
  1.19      +2 -2      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -d -b -w -u -r1.18 -r1.19
  --- core.c	2001/06/12 19:03:04	1.18
  +++ core.c	2001/06/13 13:44:39	1.19
  @@ -3173,7 +3173,7 @@
                   apr_brigade_destroy(b);
               }
               else {
  -                ap_save_brigade(f, &ctx->b, &b);
  +                ap_save_brigade(f, &ctx->b, &b, c->pool);
               }
               return APR_SUCCESS;
           }
  
  
  
  1.26      +2 -2      httpd-2.0/server/protocol.c
  
  Index: protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/protocol.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -d -b -w -u -r1.25 -r1.26
  --- protocol.c	2001/06/06 19:30:53	1.25
  +++ protocol.c	2001/06/13 13:44:39	1.26
  @@ -881,7 +881,7 @@
       }
   
       if ((ctx->curr_len < AP_MIN_BYTES_TO_WRITE) && !send_it) {
  -        return ap_save_brigade(f, &ctx->saved, &b);
  +        return ap_save_brigade(f, &ctx->saved, &b, r->pool);
       }
   
       /* We will compute a content length if:
  @@ -911,7 +911,7 @@
            * filter until we have the entire content length
            */
           if (!send_it) {
  -            ap_save_brigade(f, &ctx->saved, &b);
  +            ap_save_brigade(f, &ctx->saved, &b, r->pool);
               return APR_SUCCESS;
           }
           ap_set_content_length(r, r->bytes_sent);
  
  
  
  1.61      +1 -4      httpd-2.0/server/util_filter.c
  
  Index: util_filter.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/util_filter.c,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -d -b -w -u -r1.60 -r1.61
  --- util_filter.c	2001/06/08 11:00:14	1.60
  +++ util_filter.c	2001/06/13 13:44:40	1.61
  @@ -245,12 +245,9 @@
   }
   
   AP_DECLARE(apr_status_t) ap_save_brigade(ap_filter_t *f, apr_bucket_brigade **saveto,
  -                                         apr_bucket_brigade **b)
  +                                         apr_bucket_brigade **b, apr_pool_t *p)
   {
       apr_bucket *e;
  -    /* ### this pool should be passed in; the caller is the only one who
  -       ### really knows what the proper lifetime is for this pool. */
  -    apr_pool_t *p = f->r ? f->r->pool : f->c->pool;
       apr_status_t rv;
   
       /* If have never stored any data in the filter, then we had better
  
  
  

Mime
View raw message