httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grega...@apache.org
Subject cvs commit: httpd-2.0/server core.c
Date Sat, 16 Nov 2002 02:27:33 GMT
gregames    2002/11/15 18:27:33

  Modified:    server   core.c
  Log:
  core_output_filter: back out changes to clean up resources before the end
  of a keepalive connection until we can figure out how to do it safely for
  mmap buckets
  
  Revision  Changes    Path
  1.225     +2 -30     httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.224
  retrieving revision 1.225
  diff -u -r1.224 -r1.225
  --- core.c	13 Nov 2002 15:07:35 -0000	1.224
  +++ core.c	16 Nov 2002 02:27:33 -0000	1.225
  @@ -3665,12 +3665,11 @@
   static apr_status_t core_output_filter(ap_filter_t *f, apr_bucket_brigade *b)
   {
       apr_status_t rv;
  -    apr_bucket_brigade *more;  /* definition moved to foil a gdb bug */
  +    apr_bucket_brigade *more;
       conn_rec *c = f->c;
       core_net_rec *net = f->ctx;
       core_output_filter_ctx_t *ctx = net->out_ctx;
       apr_read_type_e eblock = APR_NONBLOCK_READ;
  -    apr_pool_t *input_pool = b->p;
   
       if (ctx == NULL) {
           ctx = apr_pcalloc(c->pool, sizeof(*ctx));
  @@ -3925,10 +3924,7 @@
                       }
                   }
               }
  -            if (!ctx->deferred_write_pool) {
  -                apr_pool_create(&ctx->deferred_write_pool, c->pool);
  -            }
  -            ap_save_brigade(f, &ctx->b, &b, ctx->deferred_write_pool);
  +            ap_save_brigade(f, &ctx->b, &b, c->pool);
   
               return APR_SUCCESS;
           }
  @@ -3999,30 +3995,6 @@
           }
   
           apr_brigade_destroy(b);
  -        
  -        /* drive cleanups for resources which were set aside 
  -         * this may occur before or after termination of the request which
  -         * created the resource
  -         */
  -        if (ctx->deferred_write_pool) {
  -            if (more && more->p == ctx->deferred_write_pool) {
  -                /* "more" belongs to the deferred_write_pool,
  -                 * which is about to be cleared.
  -                 */
  -                if (APR_BRIGADE_EMPTY(more)) {
  -                    more = NULL;
  -                }
  -                else {
  -                    /* uh oh... change more's lifetime 
  -                     * to the input brigade's lifetime 
  -                     */
  -                    apr_bucket_brigade *tmp_more = more;
  -                    more = NULL;
  -                    ap_save_brigade(f, &more, &tmp_more, input_pool);
  -                }
  -            }
  -            apr_pool_clear(ctx->deferred_write_pool);  
  -        }
   
           if (rv != APR_SUCCESS) {
               ap_log_error(APLOG_MARK, APLOG_INFO, rv, c->base_server,
  
  
  

Mime
View raw message