httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/main http_core.c
Date Tue, 14 Nov 2000 06:11:24 GMT
rbb         00/11/13 22:11:24

  Modified:    src      CHANGES
               src/include util_filter.h
               src/main http_core.c
  Log:
  Stop the default_handler from trying to deal with HEAD requests.  By doing
  this, the content-length filter can determine the C-L before we send the
  response, and we get a better response.
  
  Revision  Changes    Path
  1.328     +6 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.327
  retrieving revision 1.328
  diff -u -r1.327 -r1.328
  --- CHANGES	2000/11/14 06:07:40	1.327
  +++ CHANGES	2000/11/14 06:11:21	1.328
  @@ -1,4 +1,10 @@
   Changes with Apache 2.0a8
  +  *) Get the default_handler to stop trying to deal with HEAD requests.
  +     The idea is to let the content-length filter compute the C-L before
  +     we try to send the data.  If we can get the C-L correctly, then we
  +     should send it in the HEAD response.
  +     [Ryan Bloom]
  +     
     *) The Header filter can now determine if a body should be sent based
        on r->header_only.  The general idea of this is that if we delay
        deciding to send the body, then we might be able to compute the
  
  
  
  1.33      +1 -0      apache-2.0/src/include/util_filter.h
  
  Index: util_filter.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_filter.h,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- util_filter.h	2000/10/25 15:03:52	1.32
  +++ util_filter.h	2000/11/14 06:11:24	1.33
  @@ -73,6 +73,7 @@
   
   #define AP_NOBODY_WROTE         -1
   #define AP_NOBODY_READ          -2
  +#define AP_REQUEST_DONE         -3
   
   /* ap_input_mode_t - input filtering modes 
    * 
  
  
  
  1.220     +8 -10     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.219
  retrieving revision 1.220
  diff -u -r1.219 -r1.220
  --- http_core.c	2000/11/14 04:22:03	1.219
  +++ http_core.c	2000/11/14 06:11:24	1.220
  @@ -2875,6 +2875,8 @@
   
   static int default_handler(request_rec *r)
   {
  +    ap_bucket_brigade *bb;
  +    ap_bucket *e;
       core_dir_config *d =
   	    (core_dir_config *)ap_get_module_config(r->per_dir_config, &core_module);
       int errstatus;
  @@ -2939,18 +2941,14 @@
                          ap_md5digest(r->pool, fd));
       }
   
  -    if (!r->header_only) {
  -        ap_bucket_brigade *bb = ap_brigade_create(r->pool);
  -        ap_bucket *e = ap_bucket_create_file(fd, 0, r->finfo.size);
  +    bb = ap_brigade_create(r->pool);
  +    e = ap_bucket_create_file(fd, 0, r->finfo.size);
   
  -        AP_BRIGADE_INSERT_HEAD(bb, e);
  -        e = ap_bucket_create_eos();
  -        AP_BRIGADE_INSERT_TAIL(bb, e);
  +    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;
  +    return ap_pass_brigade(r->output_filters, bb);
   }
   
   /*
  
  
  

Mime
View raw message