On 09/28/2015 06:00 AM, j...@apache.org wrote:
Author: jim
Date: Mon Sep 28 13:00:59 2015
New Revision: 1705681
URL: http://svn.apache.org/viewvc?rev=1705681&view=rev
Log:
Sync
[...]
Modified:
httpd/httpd/branches/2.4.17-protocols-http2/modules/ssl/ssl_engine_kernel.c
URL:
http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.17-protocols-http2/modules/ssl/ssl_engine_kernel.c?rev=1705681&r1=1705680&r2=1705681&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.17-protocols-http2/modules/ssl/ssl_engine_kernel.c
(original)
+++ httpd/httpd/branches/2.4.17-protocols-http2/modules/ssl/ssl_engine_kernel.c
Mon Sep 28 13:00:59 2015
@@ -29,6 +29,7 @@
time I was too famous.''
-- Unknown */
#include "ssl_private.h"
+#include "mod_ssl.h"
#include "util_md5.h"
static void ssl_configure_env(request_rec *r, SSLConnRec *sslconn);
@@ -201,10 +202,12 @@ int ssl_hook_ReadReq(request_rec *r)
* selected by the SNI.
*/
ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
APLOGNO(02032)
- "Hostname %s provided via SNI and hostname %s
provided"
- " via HTTP select a different server",
- servername, r->hostname);
- return HTTP_MISDIRECTED_REQUEST;
+ "Hostname %s provided via SNI and hostname %s
provided"
+ " via HTTP are different", servername, host);
+ if (r->connection->keepalives > 0) {
+ return HTTP_MISDIRECTED_REQUEST;
+ }
+ return HTTP_BAD_REQUEST;
}
}
else if (((sc->strict_sni_vhost_check == SSL_ENABLED_TRUE)
This change breaks me:
ssl_engine_kernel.c:206:68: error: 'host' undeclared
Possibly a mismerge? Changing 'host' back to 'r->hostname' works for me,
but I don't know the original goal of the change.
--Jacob
