You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2013/06/10 02:40:06 UTC
svn commit: r1491315 - in /httpd/httpd/branches/2.4.x: STATUS server/core.c
Author: covener
Date: Mon Jun 10 00:40:06 2013
New Revision: 1491315
URL: http://svn.apache.org/r1491315
Log:
Merge r1490446 from trunk:
PR55069 include line number in 'AH00113: cannot use a full URL in a 401 ErrorDocument'
Modified:
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/server/core.c
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1491315&r1=1491314&r2=1491315&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Jun 10 00:40:06 2013
@@ -90,12 +90,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * core: add a file/line number to a NOTICE message
- [client AH00113: cannot use a full URL in a 401 ErrorDocument directive...
- trunk patch: http://svn.apache.org/r1490446
- 2.4.x patch: trunk works
- +1 covener, jim, fuankg
-
* core: Add post_perdir_config hook.
trunk patch: http://svn.apache.org/r1368121
2.4.x patch: trunk patch works modulo CHANGES and mmn bump
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=1491315&r1=1491314&r2=1491315&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/core.c (original)
+++ httpd/httpd/branches/2.4.x/server/core.c Mon Jun 10 00:40:06 2013
@@ -1489,8 +1489,8 @@ static const char *set_error_document(cm
if (error_number == 401 && what == REMOTE_PATH) {
ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, cmd->server, APLOGNO(00113)
- "cannot use a full URL in a 401 ErrorDocument "
- "directive --- ignoring!");
+ "%s:%d cannot use a full URL in a 401 ErrorDocument "
+ "directive --- ignoring!", cmd->directive->filename, cmd->directive->line_num);
}
else { /* Store it... */
if (conf->response_code_strings == NULL) {