Commit e785f3d7 authored by Brian Pane's avatar Brian Pane
Browse files

Ported fix for PR35330 forward from the trunk (This particular patch doesn't 

interact with the async R&D, but I'm merging it into the async-dev branch
because there's now a test case specifically for this change in
httpd-test/perl-framework.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-dev@291354 13f79535-47bb-0310-9956-ffa450edef68
parent 08daed2b

server/request.c

+2 −3
Original line number Diff line number Diff line
@@ -446,8 +446,6 @@ static void core_opts_merge(const ap_conf_vector_t *sec, core_opts_t *opts) 


    if (!(this_dir->override & OR_UNSET)) {

        opts->override = this_dir->override;

    }

    if (!(this_dir->override_opts & OR_UNSET)) {

        opts->override_opts = this_dir->override_opts;

    }

}
@@ -992,7 +990,8 @@ AP_DECLARE(int) ap_directory_walk(request_rec *r) 
                if ((res = resolve_symlink(r->filename, &thisinfo,

                                           opts.opts, r->pool)) != OK) {

                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                                  "Symbolic link not allowed: %s",

                                  "Symbolic link not allowed "

                                  "or link target not accessible: %s",

                                  r->filename);

                    return r->status = res;

                }