Commit f4d07a61 authored by Graham Leggett's avatar Graham Leggett
Browse files

mod_rewrite:Fix query string handling for proxied URLs. 

PR:	14518
Obtained from:
Submitted by:	michael teitler <michael.teitler cetelem.fr>, Jan Kratochvil <rcpt-dev.AT.httpd.apache.org jankratochvil.net>
Reviewed by:	nd, jerenkrantz, minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@105433 13f79535-47bb-0310-9956-ffa450edef68
parent eeee78ff

CHANGES

+4 −0
Original line number Diff line number Diff line 
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]















































STATUS



+3
−1






























Original line number
Diff line number
Diff line















APACHE 2.0 STATUS:                                              -*-text-*-













Last modified at [$Date: 2004/10/13 17:00:14 $]













Last modified at [$Date: 2004/10/13 17:12:08 $]































Release:


























@@ -130,11 +130,13 @@ PATCHES TO BACKPORT FROM 2.1













       (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,

































modules/mappers/mod_rewrite.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -1222,7 +1222,7 @@ static int hook_uri2file(request_rec *r)













                                          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);