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

Merge r1609936 from trunk:

mod_ssl: Set an error note for requests rejected due to
SSLStrictSNIVHostCheck

Submitted by: trawick
Reviewed by: minfrin, rjung


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

diff --git a/CHANGES b/CHANGES
index 1653c1157e..e1ffee56e3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.10
 
+  *) mod_ssl: Set an error note for requests rejected due to
+     SSLStrictSNIVHostCheck.  [Jeff Trawick]
+
   *) mod_ssl: Fix issue with redirects to error documents when handling
      SNI errors.  [Jeff Trawick]
 
diff --git a/STATUS b/STATUS
index fe15441bc0..8ca7663400 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.
 
-   * mod_ssl: Set an error note for requests rejected due to
-     SSLStrictSNIVHostCheck
-     trunk patch: http://svn.apache.org/r1609936
-     2.4.x patch: Trunk patch works modulo CHANGES.
-     +1: trawick, minfrin, rjung
-
    * core: Include any error notes set by modules in the canned error
      response for 403 errors.
      trunk patch: http://svn.apache.org/r1609938
diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index 7a7348e45f..3f905e7b86 100644
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -219,6 +219,10 @@ int ssl_hook_ReadReq(request_rec *r)
             ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, APLOGNO(02033)
                          "No hostname was provided via SNI for a name based"
                          " virtual host");
+            apr_table_setn(r->notes, "error-notes",
+                           "Reason: The client software did not provide a "
+                           "hostname using Server Name Indication (SNI), "
+                           "which is required to access this server.<br />\n");
             return HTTP_FORBIDDEN;
         }
     }