From: Brian Pane <brianp@apache.org>
Date: Sun, 25 Sep 2005 01:35:18 +0000 (+0000)
Subject: Ported fix for PR35330 forward from the trunk (This particular patch doesn't
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=188f4af37af66e3b9e2a85ad88e7b8b8db33da91;p=thirdparty%2Fapache%2Fhttpd.git

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

diff --git a/server/request.c b/server/request.c
index eb5c298327a..056ccb04bb1 100644
--- a/server/request.c
+++ b/server/request.c
@@ -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;
                 }