httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject cvs commit: httpd-2.0/modules/mappers mod_rewrite.c
Date Wed, 13 Oct 2004 17:12:10 GMT
minfrin     2004/10/13 10:12:10

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/mappers Tag: APACHE_2_0_BRANCH mod_rewrite.c
  Log:
  mod_rewrite:Fix query string handling for proxied URLs.
  PR:	14518
  Submitted by:	michael teitler <michael.teitler cetelem.fr>, Jan Kratochvil <rcpt-dev.AT.httpd.apache.org
jankratochvil.net>
  Reviewed by:	nd, jerenkrantz, minfrin
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.371 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.370
  retrieving revision 1.988.2.371
  diff -u -r1.988.2.370 -r1.988.2.371
  --- CHANGES	13 Oct 2004 16:51:36 -0000	1.988.2.370
  +++ CHANGES	13 Oct 2004 17:12:08 -0000	1.988.2.371
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.53
   
  +  *) mod_rewrite: Fix query string handling for proxied URLs. PR 14518.
  +     [michael teitler <michael.teitler cetelem.fr>,
  +      Jan Kratochvil <rcpt-dev.AT.httpd.apache.org jankratochvil.net>]
  +
     *) mod_rewrite: Fix 0 bytes write into random memory position.
        PR 31036. [André Malo]
   
  
  
  
  1.751.2.1118 +3 -1      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.1117
  retrieving revision 1.751.2.1118
  diff -u -r1.751.2.1117 -r1.751.2.1118
  --- STATUS	13 Oct 2004 17:00:14 -0000	1.751.2.1117
  +++ STATUS	13 Oct 2004 17:12:08 -0000	1.751.2.1118
  @@ -130,11 +130,13 @@
          (2.0 + 1.3)
            http://www.apache.org/~nd/dbmmap_1.3.patch
          +1: nd, trawick, jerenkrantz, jim
  +       minfrin: applied to v2.0. Must it be applied to v2.1 still?
   
       *) mod_rewrite:Fix query string handling for proxied URLs. PR 14518.
          (2.0 + 1.3)
            modules/mappers/mod_rewrite.c: r1.259
          +1: nd, jerenkrantz, minfrin
  +       minfrin: applied to v2.0
   
       *) mod_rewrite: Handle per-location rules when r->filename is unset.
          Previously this would segfault or simply not match as expected,
  
  
  
  No                   revision
  No                   revision
  1.135.2.32 +1 -1      httpd-2.0/modules/mappers/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.c,v
  retrieving revision 1.135.2.31
  retrieving revision 1.135.2.32
  diff -u -r1.135.2.31 -r1.135.2.32
  --- mod_rewrite.c	13 Oct 2004 16:51:38 -0000	1.135.2.31
  +++ mod_rewrite.c	13 Oct 2004 17:12:09 -0000	1.135.2.32
  @@ -1222,7 +1222,7 @@
                                             r->path_info, NULL);
               }
               if (r->args != NULL &&
  -                r->uri == r->unparsed_uri) {
  +                r->uri != r->unparsed_uri) {
                   /* see proxy_http:proxy_http_canon() */
                   r->filename = apr_pstrcat(r->pool, r->filename,
                                             "?", r->args, NULL);
  
  
  

Mime
View raw message