Merge r1442412 from trunk:

Fix  incomplete filename in ErrorLog when trying to access files in non existing directories
PR39944
Submitted by: jailletc36
Reviewed/backported by: jim

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

diff --git a/STATUS b/STATUS
index 9971182369beb6cd2c5c07cc263e1c8dd89e9c20..c50151e9e6c9e16206b646ca5cbc04e0c8d49567 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -91,11 +91,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * Fix incomplete filename in ErrorLog when trying to access files in non existing
-    directories (PR 39944)
-    trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1442412
-    2.4.x patch: trunk patch works with offset (modulo CHANGES)
-    +1: jailletc36, jim, rjung
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/server/core.c b/server/core.c
index c94bc3eb620148ddf7209c948c43e18952629b5a..6f6d56868173ff4453ff7123b0da98f4474652e0 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -4265,7 +4265,8 @@ static int default_handler(request_rec *r)
     if (r->method_number == M_GET || r->method_number == M_POST) {
         if (r->finfo.filetype == APR_NOFILE) {
             ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(00128)
-                          "File does not exist: %s", r->filename);
+                          "File does not exist: %s",
+                          apr_pstrcat(r->pool, r->filename, r->path_info, NULL));
             return HTTP_NOT_FOUND;
         }