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

diff --git a/STATUS b/STATUS
index ade0efe1bb0ac2b72a2e7386cd72453d116740dd..ee0d6b557a98e15f7bf9348cfd5d6e46f3d68581 100644 (file)
--- 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 0d1235ae39b7499e0a56b4a14c1d97ea978093ec..094559937d693b662821de27d64c2d43f3680a0d 100644 (file)
--- 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) {