cvs commit: apache-1.3/src/modules/standard mod_rewrite.c

[rse]

rse         99/10/27 02:13:21

  Modified:    src      CHANGES
               src/modules/standard mod_rewrite.c
  Log:
  Fixed QUERY_STRING handling for `RewriteRule ... [P]'
  in per-directory context.
  
  Submitted by: Martin Zeh <[EMAIL PROTECTED]>
  Reviewed by: Ralf S. Engelschall
  PR: 5073
  
  Revision  Changes    Path
  1.1443    +4 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1442
  retrieving revision 1.1443
  diff -u -r1.1442 -r1.1443
  --- CHANGES   1999/10/27 09:02:43     1.1442
  +++ CHANGES   1999/10/27 09:13:09     1.1443
  @@ -1,4 +1,8 @@
   Changes with Apache 1.3.10
  +  
  +  *) Fixed QUERY_STRING handling for `RewriteRule ... [P]'
  +     in per-directory context.
  +     [Martin Zeh <[EMAIL PROTECTED]>] PR#5073
   
     *) Overhauled mod_rewrite's general substitution function
        (expand_backref_inbuffer): 1. The `$0' backreference is now officially
  
  
  
  1.150     +1 -3      apache-1.3/src/modules/standard/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
  retrieving revision 1.149
  retrieving revision 1.150
  diff -u -r1.149 -r1.150
  --- mod_rewrite.c     1999/10/27 09:02:49     1.149
  +++ mod_rewrite.c     1999/10/27 09:13:17     1.150
  @@ -1381,9 +1381,7 @@
                * (r->path_info was already appended by the
                * rewriting engine because of the per-dir context!)
                */
  -            if (r->args != NULL
  -                && r->uri == r->unparsed_uri) {
  -                /* see proxy_http:proxy_http_canon() */
  +            if (r->args != NULL) {
                   r->filename = ap_pstrcat(r->pool, r->filename,
                                            "?", r->args, NULL);
               }