httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject cvs commit: httpd-2.0/server protocol.c
Date Fri, 01 Jun 2001 17:26:21 GMT
minfrin     01/06/01 10:26:21

  Modified:    modules/http http_core.c http_request.c
               server   protocol.c
  Log:
  Move the addition of default AP_HTTP_HTTP_HEADER filters to the
  insert_filter phase so that other filters are not bypassed by default.
  
  Revision  Changes    Path
  1.278     +8 -0      httpd-2.0/modules/http/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_core.c,v
  retrieving revision 1.277
  retrieving revision 1.278
  diff -u -r1.277 -r1.278
  --- http_core.c	2001/05/30 05:18:30	1.277
  +++ http_core.c	2001/06/01 17:26:13	1.278
  @@ -295,6 +295,13 @@
       return OK;
   }
   
  +static void ap_http_insert_filter(request_rec *r)
  +{
  +    ap_add_output_filter("BYTERANGE", NULL, r, r->connection);
  +    ap_add_output_filter("CONTENT_LENGTH", NULL, r, r->connection);
  +    ap_add_output_filter("HTTP_HEADER", NULL, r, r->connection);
  +}
  +
   static void register_hooks(apr_pool_t *p)
   {
       ap_hook_pre_connection(ap_pre_http_connection,NULL,NULL,
  @@ -304,6 +311,7 @@
       ap_hook_http_method(http_method,NULL,NULL,APR_HOOK_REALLY_LAST);
       ap_hook_default_port(http_port,NULL,NULL,APR_HOOK_REALLY_LAST);
   
  +    ap_hook_insert_filter(ap_http_insert_filter, NULL, NULL, APR_HOOK_REALLY_LAST);
       ap_register_input_filter("HTTP_IN", ap_http_filter, AP_FTYPE_CONNECTION);
       ap_register_input_filter("DECHUNK", ap_dechunk_filter, AP_FTYPE_TRANSCODE);
       ap_register_output_filter("HTTP_HEADER", ap_http_header_filter, 
  
  
  
  1.101     +0 -4      httpd-2.0/modules/http/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_request.c,v
  retrieving revision 1.100
  retrieving revision 1.101
  diff -u -r1.100 -r1.101
  --- http_request.c	2001/05/30 05:18:31	1.100
  +++ http_request.c	2001/06/01 17:26:15	1.101
  @@ -517,10 +517,6 @@
       new->output_filters  = r->connection->output_filters;
       new->input_filters   = r->connection->input_filters;
   
  -    ap_add_output_filter("BYTERANGE", NULL, new, new->connection);
  -    ap_add_output_filter("CONTENT_LENGTH", NULL, new, new->connection);
  -    ap_add_output_filter("HTTP_HEADER", NULL, new, new->connection);
  -      
       apr_table_setn(new->subprocess_env, "REDIRECT_STATUS",
   	apr_psprintf(r->pool, "%d", r->status));
   
  
  
  
  1.24      +0 -5      httpd-2.0/server/protocol.c
  
  Index: protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/protocol.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- protocol.c	2001/05/30 05:18:33	1.23
  +++ protocol.c	2001/06/01 17:26:19	1.24
  @@ -590,11 +590,6 @@
                        ? r->server->keep_alive_timeout * APR_USEC_PER_SEC
                        : r->server->timeout * APR_USEC_PER_SEC));
                        
  -    ap_add_output_filter("BYTERANGE", NULL, r, r->connection);
  -    ap_add_output_filter("CONTENT_LENGTH", NULL, r, r->connection);
  -    ap_add_output_filter("HTTP_HEADER", NULL, r, r->connection);
  -       
  -         
       /* Get the request... */
       if (!read_request_line(r)) {
           if (r->status == HTTP_REQUEST_URI_TOO_LARGE) {
  
  
  

Mime
View raw message