httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: httpd-2.0/server util_filter.c
Date Wed, 06 Mar 2002 17:29:40 GMT
ake         02/03/06 09:29:40

  Modified:    server   util_filter.c
  Log:
  make sure r->proto_xxput_filter gets updated as necessary when
  deleting a filter from the chain
  
  Revision  Changes    Path
  1.85      +6 -1      httpd-2.0/server/util_filter.c
  
  Index: util_filter.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/util_filter.c,v
  retrieving revision 1.84
  retrieving revision 1.85
  diff -u -r1.84 -r1.85
  --- util_filter.c	5 Mar 2002 05:21:13 -0000	1.84
  +++ util_filter.c	6 Mar 2002 17:29:39 -0000	1.85
  @@ -461,12 +461,15 @@
                                    &c->output_filters);
   }
   
  -static void remove_any_filter(ap_filter_t *f, ap_filter_t **r_filt, 
  +static void remove_any_filter(ap_filter_t *f, ap_filter_t **r_filt, ap_filter_t **p_filt,
                                 ap_filter_t **c_filt)
   {
       ap_filter_t **curr = r_filt ? r_filt : c_filt;
       ap_filter_t *fscan = *curr;
   
  +    if (*p_filt == f)
  +        *p_filt = (*p_filt)->next;
  +
       if (*curr == f) {
           *curr = (*curr)->next;
           (*curr)->prev = NULL;
  @@ -486,12 +489,14 @@
   AP_DECLARE(void) ap_remove_input_filter(ap_filter_t *f)
   {
       remove_any_filter(f, f->r ? &f->r->input_filters : NULL, 
  +                      f->r ? &f->r->proto_input_filters : NULL, 
                         &f->c->input_filters);
   }
   
   AP_DECLARE(void) ap_remove_output_filter(ap_filter_t *f)
   {
       remove_any_filter(f, f->r ? &f->r->output_filters : NULL, 
  +                      f->r ? &f->r->proto_output_filters : NULL, 
                         &f->c->output_filters);
   }
   
  
  
  

Mime
View raw message