Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 57593 invoked by uid 500); 2 Oct 2001 16:07:32 -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: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 57576 invoked by uid 500); 2 Oct 2001 16:07:32 -0000 Delivered-To: apmail-apache-1.3-cvs@apache.org Date: 2 Oct 2001 16:05:20 -0000 Message-ID: <20011002160520.15742.qmail@icarus.apache.org> From: stoddard@apache.org To: apache-1.3-cvs@apache.org Subject: cvs commit: apache-1.3/src/modules/standard mod_negotiation.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N stoddard 01/10/02 09:05:20 Modified: src/modules/standard mod_negotiation.c Log: Back port W. Rowe's 2.0 a fix for the /?M=D autoindex problem. These two lines missing from the fast-redirect logic of mod_negotation.c are what allowed mod_dir to reconstruct the _original_ path (to index.html instead of the new-found index.html.foo), merging the uri (unchanged) with the query string. It then failed, leaving an autoindex listing iff the user provided a query string. Revision Changes Path 1.107 +2 -0 apache-1.3/src/modules/standard/mod_negotiation.c Index: mod_negotiation.c =================================================================== RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_negotiation.c,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- mod_negotiation.c 2001/02/12 10:18:04 1.106 +++ mod_negotiation.c 2001/10/02 16:05:20 1.107 @@ -2648,6 +2648,8 @@ */ ap_pool_join(r->pool, sub_req->pool); r->mtime = 0; /* reset etag info for subrequest */ + r->uri = sub_req->uri; + r->args = sub_req->args; r->filename = sub_req->filename; r->handler = sub_req->handler; r->content_type = sub_req->content_type;