httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/server core.c
Date Thu, 30 Aug 2001 14:54:50 GMT
wrowe       01/08/30 07:54:50

  Modified:    server   core.c
  Log:
    Same as Jeff Trawick's patch [thank you!] only a tad faster, and error
    out on the old Set{Input|Output}Filter onefilter twofilter syntax
    (prior to this patch, only the last filter in a space seperated list
    would be configured.)
  
  Revision  Changes    Path
  1.57      +4 -4      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- core.c	2001/08/30 11:42:59	1.56
  +++ core.c	2001/08/30 14:54:50	1.57
  @@ -2818,10 +2818,10 @@
   AP_INIT_TAKE1("SetHandler", ap_set_string_slot_lower, 
          (void *)APR_XtOffsetOf(core_dir_config, handler), OR_FILEINFO,
      "a handler name that overrides any other configured handler"),
  -AP_INIT_ITERATE("SetOutputFilter", ap_set_string_slot, 
  +AP_INIT_TAKE1("SetOutputFilter", ap_set_string_slot, 
          (void *)APR_XtOffsetOf(core_dir_config, output_filters), OR_FILEINFO,
      "filter (or ; delimited list of filters) to be run on the request content"),
  -AP_INIT_ITERATE("SetInputFilter", ap_set_string_slot, 
  +AP_INIT_TAKE1("SetInputFilter", ap_set_string_slot, 
          (void *)APR_XtOffsetOf(core_dir_config, input_filters), OR_FILEINFO,
      "filter (or ; delimited list of filters) to be run on the request body"),
   
  @@ -3359,14 +3359,14 @@
       const char *filter, *filters = conf->output_filters;
   
       if (filters) {
  -        while ((filter = ap_getword(r->pool, &filters, ';')) && filter[0])
{
  +        while (*filters && (filter = ap_getword(r->pool, &filters, ';')))
{
               ap_add_output_filter(filter, NULL, r, r->connection);
           }
       }
   
       filters = conf->input_filters;
       if (filters) {
  -        while ((filter = ap_getword(r->pool, &filters, ';')) && filter[0])
{
  +        while (*filters && (filter = ap_getword(r->pool, &filters, ';')))
{
               ap_add_input_filter(filter, NULL, r, r->connection);
           }
       }
  
  
  

Mime
View raw message