From: Rich Bowen <rbowen@apache.org>
Date: Mon, 5 Mar 2012 01:20:57 +0000 (+0000)
Subject: As per https://issues.apache.org/bugzilla/show_bug.cgi?id=51746 mention
X-Git-Tag: 2.4.2~241
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18df96657ac9463280fe6029482284be3840ade2;p=apache

As per https://issues.apache.org/bugzilla/show_bug.cgi?id=51746 mention
that subjectAltName and wildcard certs are viable solutions.


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

diff --git a/docs/manual/ssl/ssl_faq.html.en b/docs/manual/ssl/ssl_faq.html.en
index fdeda5520c..8f16861d0f 100644
--- a/docs/manual/ssl/ssl_faq.html.en
+++ b/docs/manual/ssl/ssl_faq.html.en
@@ -606,6 +606,11 @@ error when connecting to my newly installed server?</a></h3>
     complete the SSL handshake phase. See the next question for how to
     circumvent this issue.</p>
 
+    <p>Note that if you have a wildcard SSL certificate, or a
+    certificate that has multple hostnames on it using subjectAltName
+    fields, you can use SSL on name-based virtual hosts without further
+    workarounds.</p>
+
 
 <h3><a name="vhosts2" id="vhosts2">Is it possible to use Name-Based
 Virtual Hosting to identify different SSL virtual hosts?</a></h3>
@@ -620,6 +625,11 @@ Virtual Hosting to identify different SSL virtual hosts?</a></h3>
     feature that only the most recent revisions of the SSL
     specification added, called Server Name Indication (SNI).</p>
 
+    <p>Note that if you have a wildcard SSL certificate, or a
+    certificate that has multple hostnames on it using subjectAltName
+    fields, you can use SSL on name-based virtual hosts without further
+    workarounds.</p>
+
     <p>The reason is that the SSL protocol is a separate layer which
     encapsulates the HTTP protocol. So the SSL session is a separate
     transaction, that takes place before the HTTP session has begun.
diff --git a/docs/manual/ssl/ssl_faq.xml b/docs/manual/ssl/ssl_faq.xml
index 8fa2ce3bbe..99a3f8ca39 100644
--- a/docs/manual/ssl/ssl_faq.xml
+++ b/docs/manual/ssl/ssl_faq.xml
@@ -607,6 +607,11 @@ error when connecting to my newly installed server?</title>
     handshake is finished, but the information is needed in order to
     complete the SSL handshake phase. See the next question for how to
     circumvent this issue.</p>
+
+    <p>Note that if you have a wildcard SSL certificate, or a
+    certificate that has multple hostnames on it using subjectAltName
+    fields, you can use SSL on name-based virtual hosts without further
+    workarounds.</p>
 </section>
 
 <section id="vhosts2"><title>Is it possible to use Name-Based
@@ -622,6 +627,11 @@ Virtual Hosting to identify different SSL virtual hosts?</title>
     feature that only the most recent revisions of the SSL
     specification added, called Server Name Indication (SNI).</p>
 
+    <p>Note that if you have a wildcard SSL certificate, or a
+    certificate that has multple hostnames on it using subjectAltName
+    fields, you can use SSL on name-based virtual hosts without further
+    workarounds.</p>
+
     <p>The reason is that the SSL protocol is a separate layer which
     encapsulates the HTTP protocol. So the SSL session is a separate
     transaction, that takes place before the HTTP session has begun.