From 4354e1e2d65cce75233e28c429c33cf2fb22d694 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Wed, 6 Feb 2013 17:15:16 +0000 Subject: [PATCH] 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 --- STATUS | 5 ----- server/core.c | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/STATUS b/STATUS index 9971182369..c50151e9e6 100644 --- 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 c94bc3eb62..6f6d568681 100644 --- 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; } -- 2.40.0