summaryrefslogtreecommitdiffstats
path: root/modules/http
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2014-07-12 16:52:08 +0200
committerJeff Trawick <trawick@apache.org>2014-07-12 16:52:08 +0200
commit6f8dfb8ed9cc809a778f3cbe7eb4e1b3a48b35fc (patch)
tree11b38b8fbcb98f0ffc8b7eeb7c8b0b5b3cfa284e /modules/http
parentSet an error note for requests rejected due to SSLStrictSNIVHostCheck. (diff)
downloadapache2-6f8dfb8ed9cc809a778f3cbe7eb4e1b3a48b35fc.tar.xz
apache2-6f8dfb8ed9cc809a778f3cbe7eb4e1b3a48b35fc.zip
Include any error notes set by modules in the canned error
response for 403 errors. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1609938 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/http')
-rw-r--r--modules/http/http_protocol.c11
1 files changed, 6 insertions, 5 deletions
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 ",