httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/http http_request.c
Date Wed, 12 Mar 2003 18:24:26 GMT
trawick     2003/03/12 10:24:26

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/http Tag: APACHE_2_0_BRANCH http_request.c
  Log:
  merge this to 2.0.45-dev:
  
   *) Keep the subrequest filter in place when a subrequest is
      redirected.  PR 15423.  [Jeff Trawick]
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.60 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.59
  retrieving revision 1.988.2.60
  diff -u -r1.988.2.59 -r1.988.2.60
  --- CHANGES	11 Mar 2003 18:04:30 -0000	1.988.2.59
  +++ CHANGES	12 Mar 2003 18:24:24 -0000	1.988.2.60
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.45
   
  +  *) Keep the subrequest filter in place when a subrequest is 
  +     redirected.  PR 15423.  [Jeff Trawick]
  +
     *) you can now specify the compression level for mod_deflate. 
        [Ian Holsman, Stephen Pierzchala <stephen@pierzchala.com>, 
        Michael Schroepl <Michael.Schroepl@telekurs.de>]
  
  
  
  1.751.2.173 +1 -6      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.172
  retrieving revision 1.751.2.173
  diff -u -r1.751.2.172 -r1.751.2.173
  --- STATUS	12 Mar 2003 01:33:30 -0000	1.751.2.172
  +++ STATUS	12 Mar 2003 18:24:25 -0000	1.751.2.173
  @@ -120,11 +120,6 @@
         [ This one is under review.  Don't merge.  ]
         +1:
   
  -    * Fix a problem where a redirected subrequest doesn't have the
  -      subrequest filter in place (PR 15423).
  -      modules/http/http_request.c: r1.154
  -      +1: trawick, nd, ianh
  -
       * Fix mod_rewrite's path handling. This should apply at least to 2.0.
         A working patch (on my machine) for 1.3 is:
         <http://cvs.apache.org/~nd/rewrite.1.3.patch>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.152.2.2 +9 -0      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.152.2.1
  retrieving revision 1.152.2.2
  diff -u -r1.152.2.1 -r1.152.2.2
  --- http_request.c	3 Feb 2003 17:31:41 -0000	1.152.2.1
  +++ http_request.c	12 Mar 2003 18:24:26 -0000	1.152.2.2
  @@ -397,6 +397,15 @@
       new->output_filters  = new->proto_output_filters;
       new->input_filters   = new->proto_input_filters;
   
  +    if (new->main) {
  +        /* Add back the subrequest filter, which we lost when
  +         * we set output_filters to include only the protocol
  +         * output filters from the original request.
  +         */
  +        ap_add_output_filter_handle(ap_subreq_core_filter_handle,
  +                                    NULL, new, new->connection);
  +    }
  +    
       update_r_in_filters(new->input_filters, r, new);
       update_r_in_filters(new->output_filters, r, new);
   
  
  
  

Mime
View raw message