Commit 2e30ffba authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Two cases we are certain of canonical correctness


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90586 13f79535-47bb-0310-9956-ffa450edef68
parent 52dd9b1e

modules/http/http_request.c

+1 −0
Original line number Diff line number Diff line
@@ -569,6 +569,7 @@ AP_DECLARE(void) ap_internal_fast_redirect(request_rec *rr, request_rec *r) 
    r->uri = rr->uri;

    r->args = rr->args;

    r->filename = rr->filename;

    r->canonical_filename = rr->canonical_filename;

    r->handler = rr->handler;

    r->content_type = rr->content_type;

    r->content_encoding = rr->content_encoding;

modules/mappers/mod_dir.c

+4 −0
Original line number Diff line number Diff line
@@ -161,7 +161,11 @@ static int handle_dir(request_rec *r) 
     */



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

        if (r->canonical_filename)

            r->canonical_filename = r->filename;

    }



    if (d->index_names) {