Commit 1ee1e272 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

PR 33112 - Fix for query string preservation after content negotiation. 

r1002165 in test framework needs to be revertet now since this is fixed.
Author rjung, reviewed by wrowe, sf.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1004972 13f79535-47bb-0310-9956-ffa450edef68
parent dddd48f7

STATUS

+0 −7
Changes for STATUS: 0 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -132,13 +132,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  * mod_negotiation: PR 33112 - Fix for query string preservation after content negotiation

    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=915407

    2.2.x patch: http://svn.apache.org/viewvc?view=revision&revision=917017

    Backport: http://people.apache.org/~rjung/patches/pr-33112-2_0.patch

    Revert r1002165 in test framework, once this is fixed.

    +1: rjung, wrowe, sf



  * mod_expires: Expires time shouldn't be in the past

    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=708902

    2.2.x patch: http://svn.apache.org/viewvc?view=revision&revision=713142

modules/mappers/mod_negotiation.c

+3 −0
Changes for modules/mappers/mod_negotiation.c: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2992,6 +2992,9 @@ static int handle_multi(request_rec *r) 
            goto return_from_multi;

        }

    }

    if (sub_req->args == NULL) {

        sub_req->args = r->args;

    }



    /* now do a "fast redirect" ... promotes the sub_req into the main req */

    ap_internal_fast_redirect(sub_req, r);