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

  Fix my typo (I invented the silly constant, you would expect me to recall it.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90594 13f79535-47bb-0310-9956-ffa450edef68
parent 1571a1aa

server/core.c

+6 −6
Original line number Diff line number Diff line
@@ -2911,10 +2911,10 @@ AP_DECLARE_NONSTD(int) ap_core_translate(request_rec *r) 
	&& (r->server->path[r->server->pathlen - 1] == '/'

	    || r->uri[r->server->pathlen] == '/'

	    || r->uri[r->server->pathlen] == '\0')) {

        if (apr_filepath_merge(r->filename, conf->ap_document_root,

        if (apr_filepath_merge(&r->filename, conf->ap_document_root,

			       r->uri + r->server->pathlen, 

                               APR_FILEPATH_TRUENAME 

                             | APR_SECUREROOT_TEST, r->pool)

                             | APR_FILEPATH_SECUREROOT, r->pool)

                    != APR_SUCCESS) {

            return HTTP_FORBIDDEN;

        }
@@ -2926,10 +2926,10 @@ AP_DECLARE_NONSTD(int) ap_core_translate(request_rec *r) 
         * /'s in a row.  This happens under windows when the document

         * root ends with a /

         */

        if (apr_filepath_merge(r->filename, conf->ap_document_root,

                               r->uri + (*(r->uri) == '/') ? 1 : 0, 

        if (apr_filepath_merge(&r->filename, conf->ap_document_root,

                               r->uri + ((*(r->uri) == '/') ? 1 : 0),

                               APR_FILEPATH_TRUENAME

                             | APR_SECUREROOT_TEST, r->pool)

                             | APR_FILEPATH_SECUREROOT, r->pool)

                    != APR_SUCCESS) {

            return HTTP_FORBIDDEN;

        }