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_protocol.c
Date Mon, 04 Jun 2001 21:43:09 GMT
rbb         01/06/04 14:43:08

  Modified:    .        CHANGES
               modules/http http_protocol.c
  Log:
  Fix the reset_filters function.  If we set r->output_filters to NULL,
  then we also have to reset the connection's filters.
  Submitted by:	John Sterling <sterling@covalent.net>
  
  Revision  Changes    Path
  1.213     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.212
  retrieving revision 1.213
  diff -u -d -b -w -u -r1.212 -r1.213
  --- CHANGES	2001/06/01 22:13:58	1.212
  +++ CHANGES	2001/06/04 21:43:06	1.213
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.19-dev
   
  +  *) Fix reset_filter().  We need to be careful how we remove filters.
  +     If we set r->output_filters to NULL, we also have to reset the
  +     connection's filters.  [John Sterling]
  +
     *) Optimise reset_filter() in http_protocol.c. [Greg Stein]
   
     *) Add a check to ap_die() to make sure the filter stack is sane and
  
  
  
  1.323     +3 -2      httpd-2.0/modules/http/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_protocol.c,v
  retrieving revision 1.322
  retrieving revision 1.323
  diff -u -d -b -w -u -r1.322 -r1.323
  --- http_protocol.c	2001/06/01 22:14:01	1.322
  +++ http_protocol.c	2001/06/04 21:43:08	1.323
  @@ -1745,8 +1745,9 @@
   
   static void reset_filters(request_rec *r)
   {
  -    r->output_filters = NULL;
  -    ap_add_output_filter("CORE", NULL, r, r->connection);
  +    r->connection->output_filters = r->output_filters = NULL;
  +    ap_add_output_filter("CORE", NULL, NULL, r->connection);
  +    r->output_filters = r->connection->output_filters;
       ap_add_output_filter("CONTENT_LENGTH", NULL, r, r->connection);
       ap_add_output_filter("HTTP_HEADER", NULL, r, r->connection);
   }
  
  
  

Mime
View raw message