Commit 7117fe12 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Ahhh, a const headache.  Here's a flag that is writeable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90861 13f79535-47bb-0310-9956-ffa450edef68
parent 344de95f

server/request.c

+3 −3
Original line number Diff line number Diff line
@@ -1554,14 +1554,14 @@ AP_DECLARE(request_rec *) ap_sub_req_lookup_file(const char *new_file, 


    /* Translate r->filename, if it was canonical, it stays canonical

     */

    if (r->canonical_filename != r->filename)

        r->canonical_filename = NULL;

    if (r->canonical_filename == r->filename)

        rnew->canonical_filename = (char*)(1);

    if (apr_filepath_merge(&rnew->filename, fdir, new_file,

                           APR_FILEPATH_TRUENAME, rnew->pool) != APR_SUCCESS) {

        rnew->status = HTTP_FORBIDDEN;

        return rnew;

    }

    if (r->canonical_filename)

    if (rnew->canonical_filename)

        rnew->canonical_filename = rnew->filename;



    /*