www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Two cases we are certain of canonical correctness

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90586 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2001-08-23 21:05:42 +00:00
parent ecad72f782
commit 13cff90a55
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/http/http_request.c
View File

@@ -569,6 +569,7 @@ AP_DECLARE(void) ap_internal_fast_redirect(request_rec *rr, request_rec *r)
r->uri = rr->uri; r->uri = rr->uri;
r->args = rr->args; r->args = rr->args;
r->filename = rr->filename; r->filename = rr->filename;
r->canonical_filename = rr->canonical_filename;
r->handler = rr->handler; r->handler = rr->handler;
r->content_type = rr->content_type; r->content_type = rr->content_type;
r->content_encoding = rr->content_encoding; r->content_encoding = rr->content_encoding;

4
modules/mappers/mod_dir.c
View File

@@ -161,7 +161,11 @@ static int handle_dir(request_rec *r)
*/ */
if (r->filename[strlen(r->filename) - 1] != '/') { if (r->filename[strlen(r->filename) - 1] != '/') {
if (r->filename != r->canonical_filename)
r->canonical_filename = NULL;
r->filename = apr_pstrcat(r->pool, r->filename, "/", NULL); r->filename = apr_pstrcat(r->pool, r->filename, "/", NULL);
if (r->canonical_filename)
r->canonical_filename = r->filename;
} }
if (d->index_names) { if (d->index_names) {