From 5b7ff9e5f56c45e72bca3cedbd9cd9f290bc316e Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Mon, 10 Jun 2013 00:40:06 +0000 Subject: [PATCH] Merge r1490446 from trunk: PR55069 include line number in 'AH00113: cannot use a full URL in a 401 ErrorDocument' git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1491315 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 6 ------ server/core.c | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/STATUS b/STATUS index ade0efe1bb..ee0d6b557a 100644 --- a/STATUS +++ b/STATUS @@ -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 diff --git a/server/core.c b/server/core.c index 0d1235ae39..094559937d 100644 --- a/server/core.c +++ b/server/core.c @@ -1489,8 +1489,8 @@ static const char *set_error_document(cmd_parms *cmd, void *conf_, 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) { -- 2.40.0