Skip to content

Commit 426e303

Browse files
committed
Merge r1927320 from trunk:
mentioned dropped 'sslengine optional' git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1927321 13f79535-47bb-0310-9956-ffa450edef68
1 parent 1e5e490 commit 426e303

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

docs/manual/mod/mod_ssl.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -563,10 +563,15 @@ SSLSessionCacheTimeout 600
563563
<directivesynopsis>
564564
<name>SSLEngine</name>
565565
<description>SSL Engine Operation Switch</description>
566-
<syntax>SSLEngine on|off|optional</syntax>
566+
<syntax>SSLEngine on|off</syntax>
567567
<default>SSLEngine off</default>
568568
<contextlist><context>server config</context>
569569
<context>virtual host</context></contextlist>
570+
<compatibility>
571+
Support for the "optional" argument was removed in 2.4.64. It enabled
572+
RFC 2817 (TLS Upgrade) support.
573+
</compatibility>
574+
570575

571576
<usage>
572577
<p>
@@ -583,10 +588,6 @@ SSLEngine on
583588
&lt;/VirtualHost&gt;
584589
</highlight>
585590
</example>
586-
<p>In Apache 2.1 and later, <directive>SSLEngine</directive> can be set to
587-
<code>optional</code>. This enables support for
588-
<a href="http://www.ietf.org/rfc/rfc2817.txt">RFC 2817</a>, Upgrading to TLS
589-
Within HTTP/1.1. At this time no web browsers support RFC 2817.</p>
590591
</usage>
591592
</directivesynopsis>
592593

0 commit comments

Comments
 (0)