From: Joshua Slive <slive@apache.org>
Date: Wed, 21 Sep 2005 15:37:21 +0000 (+0000)
Subject: Merge r280018 from trunk:
X-Git-Tag: 2.1.8~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f001b2ceea2ab8978e541f0bcc8f994ab36e5a3;p=thirdparty%2Fapache%2Fhttpd.git

Merge r280018 from trunk:

Any failure in apr_stat on a symlink currently gives
"Symbolic link not allowed", which results in much head-scratching
if the actual problem is a broken link of some sort.  The real
fix would be to propogate the correct apr_stat error into the
error log, but that would require more refactoring than I'm
prepared to do.  This change simply expands the error message
to include both possibilities.  It improves the situation for
PR28515 but does not solve it.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290727 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/request.c b/server/request.c
index 1a1b5f118f7..d9d37b40cc0 100644
--- a/server/request.c
+++ b/server/request.c
@@ -991,7 +991,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;
                 }