Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 80890 invoked from network); 6 Oct 2010 10:30:37 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 Oct 2010 10:30:37 -0000 Received: (qmail 66192 invoked by uid 500); 6 Oct 2010 10:30:37 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 65991 invoked by uid 500); 6 Oct 2010 10:30:35 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 65984 invoked by uid 99); 6 Oct 2010 10:30:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Oct 2010 10:30:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Oct 2010 10:30:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D2A9823888E7; Wed, 6 Oct 2010 10:30:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1004972 - in /httpd/httpd/branches/2.0.x: STATUS modules/mappers/mod_negotiation.c Date: Wed, 06 Oct 2010 10:30:11 -0000 To: cvs@httpd.apache.org From: fuankg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101006103011.D2A9823888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fuankg Date: Wed Oct 6 10:30:11 2010 New Revision: 1004972 URL: http://svn.apache.org/viewvc?rev=1004972&view=rev Log: 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. Modified: httpd/httpd/branches/2.0.x/STATUS httpd/httpd/branches/2.0.x/modules/mappers/mod_negotiation.c Modified: httpd/httpd/branches/2.0.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/STATUS?rev=1004972&r1=1004971&r2=1004972&view=diff ============================================================================== --- httpd/httpd/branches/2.0.x/STATUS (original) +++ httpd/httpd/branches/2.0.x/STATUS Wed Oct 6 10:30:11 2010 @@ -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 Modified: httpd/httpd/branches/2.0.x/modules/mappers/mod_negotiation.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/modules/mappers/mod_negotiation.c?rev=1004972&r1=1004971&r2=1004972&view=diff ============================================================================== --- httpd/httpd/branches/2.0.x/modules/mappers/mod_negotiation.c (original) +++ httpd/httpd/branches/2.0.x/modules/mappers/mod_negotiation.c Wed Oct 6 10:30:11 2010 @@ -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);