Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 13 Nov 2000 23:42:42 -0000
Message-ID: <20001113234242.72097.qmail@locus.apache.org>
From: rbb@locus.apache.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/main http_core.c

rbb         00/11/13 15:42:42

  Modified:    src      CHANGES
               src/main http_core.c
  Log:
  Get the default_handler to use the bucket code directly.  This keeps us
  from traveling down the stack multiple time for a static page.
  
  Revision  Changes    Path
  1.323     +5 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.322
  retrieving revision 1.323
  diff -u -r1.322 -r1.323
  --- CHANGES	2000/11/13 20:23:40	1.322
  +++ CHANGES	2000/11/13 23:42:39	1.323
  @@ -1,4 +1,9 @@
   Changes with Apache 2.0a8
  +  *) Get the core_output_filter to use the bucket interface directly.
  +     This keeps us from calling the content-length filter multiple times
  +     for a simple static request.
  +     [Ryan Bloom]
  +
     *) We are sending the content-type correctly now.
        [Ryan Bloom and Will Rowe]
   
  
  
  
  1.216     +7 -2      apache-2.0/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
  retrieving revision 1.215
  retrieving revision 1.216
  diff -u -r1.215 -r1.216
  --- http_core.c	2000/11/13 22:52:19	1.215
  +++ http_core.c	2000/11/13 23:42:40	1.216
  @@ -2940,9 +2940,14 @@
       }
   
       if (!r->header_only) {
  -        apr_size_t nbytes;
  +        ap_bucket_brigade *bb = ap_brigade_create(r->pool);
  +        ap_bucket *e = ap_bucket_create_file(fd, 0, r->finfo.size);
   
  -        ap_send_fd(fd, r, 0, r->finfo.size, &nbytes);
  +        AP_BRIGADE_INSERT_HEAD(bb, e);
  +        e = ap_bucket_create_eos();
  +        AP_BRIGADE_INSERT_TAIL(bb, e);
  +
  +        ap_pass_brigade(r->output_filters, bb);
       }
   
       return OK;