You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2013/02/06 18:15:16 UTC
svn commit: r1443076 - in /httpd/httpd/branches/2.4.x: ./ STATUS
server/core.c
Author: jim
Date: Wed Feb 6 17:15:16 2013
New Revision: 1443076
URL: http://svn.apache.org/viewvc?rev=1443076&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/server/core.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1442412
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1443076&r1=1443075&r2=1443076&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Feb 6 17:15:16 2013
@@ -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 ]
Modified: httpd/httpd/branches/2.4.x/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core.c?rev=1443076&r1=1443075&r2=1443076&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/core.c (original)
+++ httpd/httpd/branches/2.4.x/server/core.c Wed Feb 6 17:15:16 2013
@@ -4265,7 +4265,8 @@ static int default_handler(request_rec *
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;
}