diff options
| -rw-r--r-- | docs/manual/glossary.html.en | 11 | ||||
| -rw-r--r-- | docs/manual/glossary.xml | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/docs/manual/glossary.html.en b/docs/manual/glossary.html.en index 698e86b6b0..8e39c2ea5e 100644 --- a/docs/manual/glossary.html.en +++ b/docs/manual/glossary.html.en @@ -381,6 +381,17 @@ See: <a href="ssl/">SSL/TLS Encryption</a> </dd> + <dt><a name="servernameindication" id="servernameindication">Server Name + Indication</a> <a name="sni" id="sni">(SNI)</a></dt> + <dd>An SSL function that allows passing the desired server + hostname in the initial SSL handshake message, so that the web + server can select the correct virtual host configuration to use + in processing the SSL handshake. It was added to SSL starting + with the TLS extensions, RFC 3546. <br /> + See: <a href="ssl/ssl_faq.html">the SSL FAQ</a> + and <a href="http://www.ietf.org/rfc/rfc3546.txt">RFC 3546</a> + </dd> + <dt><a name="serversideincludes" id="serversideincludes">Server Side Includes</a> <a name="ssi" id="ssi">(SSI)</a></dt> <dd>A technique for embedding processing directives inside HTML files.<br /> diff --git a/docs/manual/glossary.xml b/docs/manual/glossary.xml index cd75f3402b..c85d817483 100644 --- a/docs/manual/glossary.xml +++ b/docs/manual/glossary.xml @@ -400,6 +400,17 @@ See: <a href="ssl/">SSL/TLS Encryption</a> </dd> + <dt><a name="servernameindication" id="servernameindication">Server Name + Indication</a> <a name="sni" id="sni">(SNI)</a></dt> + <dd>An SSL function that allows passing the desired server + hostname in the initial SSL handshake message, so that the web + server can select the correct virtual host configuration to use + in processing the SSL handshake. It was added to SSL starting + with the TLS extensions, RFC 3546. <br /> + See: <a href="ssl/ssl_faq.html">the SSL FAQ</a> + and <a href="http://www.ietf.org/rfc/rfc3546.txt">RFC 3546</a> + </dd> + <dt><a name="serversideincludes" id="serversideincludes">Server Side Includes</a> <a name="ssi" id="ssi">(SSI)</a></dt> <dd>A technique for embedding processing directives inside HTML files.<br /> |