www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

Remove the link in the speaking-http-on-https error message.

Browse Source 
With SNI, the link will usually be wrong. So better send no link at all.
    
PR: 50823


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1328326 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Fritsch
2012-04-20 11:22:20 +00:00
parent 43d54ae919
commit aaa0d67dcc
2 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -2,7 +2,8 @@
Changes with Apache 2.5.0 Changes with Apache 2.5.0
*) mod_ssl: Send the error message for speaking http to an https port using *) mod_ssl: Send the error message for speaking http to an https port using
HTTP/1.0 instead of HTTP/0.9. PR 50823. [Stefan Fritsch] HTTP/1.0 instead of HTTP/0.9, and omit the link that may be wrong when
using SNI. PR 50823. [Stefan Fritsch]
*) mod_authz_core: Fix parsing of Require arguments in <AuthzProviderAlias>. *) mod_authz_core: Fix parsing of Require arguments in <AuthzProviderAlias>.
PR 53048. [Stefan Fritsch] PR 53048. [Stefan Fritsch]

28
modules/ssl/ssl_engine_kernel.c
View File

@@ -141,30 +141,10 @@ int ssl_hook_ReadReq(request_rec *r)
} }
if (sslconn->non_ssl_request == NON_SSL_SET_ERROR_MSG) { if (sslconn->non_ssl_request == NON_SSL_SET_ERROR_MSG) {
const char *errmsg; apr_table_setn(r->notes, "error-notes",
char *thisurl; "Reason: You're speaking plain HTTP to an SSL-enabled "
char *thisport = ""; "server port.<br />\n Instead use the HTTPS scheme to "
int port = ap_get_server_port(r); "access this URL, please.<br />\n");
if (!ap_is_default_port(port, r)) {
thisport = apr_psprintf(r->pool, ":%u", port);
}
thisurl = ap_escape_html(r->pool,
apr_psprintf(r->pool, "https://%s%s/",
ap_get_server_name_for_url(r),
thisport));
errmsg = apr_psprintf(r->pool,
"Reason: You're speaking plain HTTP "
"to an SSL-enabled server port.<br />\n"
"Instead use the HTTPS scheme to access "
"this URL, please.<br />\n"
"<blockquote>Hint: "
"<a href=\"%s\"><b>%s</b></a></blockquote>",
thisurl, thisurl);
apr_table_setn(r->notes, "error-notes", errmsg);
/* Now that we have caught this error, forget it. we are done /* Now that we have caught this error, forget it. we are done
* with using SSL on this request. * with using SSL on this request.