Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 4 Mar 2002 09:20:03 -0000
Message-ID: <20020304092003.43204.qmail@icarus.apache.org>
From: jerenkrantz@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server core.c

jerenkrantz    02/03/04 01:20:03

  Modified:    server   core.c
  Log:
  Ensure that net_time filter isn't added on subreqs - we assume that it is
  added on !r->main requests.  This led to infinite loop/SEGV when dealing
  with anything that created a subreq.
  
  (I don't think core_create_req is a good place for adding this filter.)
  
  Revision  Changes    Path
  1.155     +2 -3      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.154
  retrieving revision 1.155
  diff -u -r1.154 -r1.155
  --- core.c	3 Mar 2002 22:34:55 -0000	1.154
  +++ core.c	4 Mar 2002 09:20:03 -0000	1.155
  @@ -3772,12 +3772,11 @@
       }
       else {
           req_cfg->bb = apr_brigade_create(r->pool);
  +        ap_add_input_filter_handle(ap_net_time_filter_handle,
  +                                   NULL, r, r->connection);
       }
       ap_set_module_config(r->request_config, &core_module, req_cfg);
   
  -    ap_add_input_filter_handle(ap_net_time_filter_handle,
  -                               NULL, r, r->connection);
  -    
       /* Begin by presuming any module can make it's own path_info assumptions,
        * until some module interjects and changes the value.
        */