From: Jeff Trawick <trawick@apache.org>
Date: Mon, 14 Jul 2014 00:29:06 +0000 (+0000)
Subject: Merge r1609938 from trunk:
X-Git-Tag: 2.4.10~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8e8aff40fec14a851033f2db731b837e486ff0c;p=apache

Merge r1609938 from trunk:

core: Include any error notes set by modules in the canned error
response for 403 errors.

Submitted by: trawick
Reviewed by: minfrin, rjung


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1610328 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index e1ffee56e3..4e14a253d5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.10
 
+  *) core: Include any error notes set by modules in the canned error
+     response for 403 errors.  [Jeff Trawick]
+
   *) mod_ssl: Set an error note for requests rejected due to
      SSLStrictSNIVHostCheck.  [Jeff Trawick]
 
diff --git a/STATUS b/STATUS
index 8ca7663400..4fb44c0cc3 100644
--- a/STATUS
+++ b/STATUS
@@ -122,12 +122,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      ylavic: does not depend on r1572092 or r1572655 and al above,
              these proposals can be backported in any order.
 
-   * core: Include any error notes set by modules in the canned error
-     response for 403 errors.
-     trunk patch: http://svn.apache.org/r1609938
-     2.4.x patch: Trunk patch works modulo CHANGES.
-     +1: trawick, minfrin, rjung
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 6705e704b7..fe2cc20879 100644
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -1139,11 +1139,12 @@ static const char *get_canned_error_string(int status,
                                   "error-notes",
                                   "</p>\n"));
     case HTTP_FORBIDDEN:
-        return(apr_pstrcat(p,
-                           "<p>You don't have permission to access ",
-                           ap_escape_html(r->pool, r->uri),
-                           "\non this server.</p>\n",
-                           NULL));
+        s1 = apr_pstrcat(p,
+                         "<p>You don't have permission to access ",
+                         ap_escape_html(r->pool, r->uri),
+                         "\non this server.<br />\n",
+                         NULL);
+        return(add_optional_notes(r, s1, "error-notes", "</p>\n"));
     case HTTP_NOT_FOUND:
         return(apr_pstrcat(p,
                            "<p>The requested URL ",