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/modules/http http_request.c
Date Tue, 05 Mar 2002 05:41:28 GMT
rbb         02/03/04 21:41:28

  Modified:    modules/http http_request.c
  Log:
  Remove another hack from the server.  The add_required_filters function
  was required to make sure that the sub request had the correct filters
  when we went send the error page.  With the new filter insertion logic,
  this is no longer necessary.
  
  Revision  Changes    Path
  1.128     +0 -25     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.127
  retrieving revision 1.128
  diff -u -r1.127 -r1.128
  --- http_request.c	4 Mar 2002 19:11:05 -0000	1.127
  +++ http_request.c	5 Mar 2002 05:41:28 -0000	1.128
  @@ -91,28 +91,6 @@
   #include <stdarg.h>
   #endif
   
  -static void add_required_filters(request_rec *r)
  -{
  -    ap_filter_t *f = r->output_filters;
  -    int has_core = 0, has_content = 0, has_http_header = 0;
  -    while (f) {
  -        if(!strcasecmp(f->frec->name, "CORE"))
  -            has_core = 1; 
  -        else if(!strcasecmp(f->frec->name, "CONTENT_LENGTH"))
  -            has_content = 1; 
  -        else if(!strcasecmp(f->frec->name, "HTTP_HEADER")) 
  -            has_http_header = 1;
  -        f = f->next;
  -    }
  -    if(!has_core) 
  -        ap_add_output_filter("CORE", NULL, r, r->connection);
  -    if(!has_content)
  -        ap_add_output_filter("CONTENT_LENGTH", NULL, r, r->connection);
  -    if(!has_http_header) 
  -        ap_add_output_filter("HTTP_HEADER", NULL, r, r->connection);
  -
  -}
  -
   /*****************************************************************
    *
    * Mainline request processing...
  @@ -127,8 +105,6 @@
        * to obtain the original error, but when adding the required_filters,
        * we need to do so against the one we came in with.  So, save it.
        */
  -    request_rec *cur = r;
  -
       if (type == AP_FILTER_ERROR) {
           return;
       }
  @@ -229,7 +205,6 @@
                           custom_response);
           }
       }
  -    add_required_filters(cur);
       ap_send_error_response(r, recursive_error);
   }
   
  
  
  

Mime
View raw message