You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2014/01/06 17:02:58 UTC
svn commit: r1555876 - in /httpd/httpd/branches/2.4.x: ./ docs/manual/
docs/manual/mod/ docs/manual/mod/mod_ssl.xml
Author: trawick
Date: Mon Jan 6 16:02:57 2014
New Revision: 1555876
URL: http://svn.apache.org/r1555876
Log:
merge r1555424 from trunk:
document on/off parameter in the usual manner and show defaults for
SSLHonorCipherOrder, SSLOCSPEnable, SSLOCSPOverrideResponder, and
SSLInsecureRenegotiation
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/docs/manual/ (props changed)
httpd/httpd/branches/2.4.x/docs/manual/mod/ (props changed)
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.xml
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1555424
Propchange: httpd/httpd/branches/2.4.x/docs/manual/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk/docs/manual:r1555424
Propchange: httpd/httpd/branches/2.4.x/docs/manual/mod/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk/docs/manual/mod:r1555424
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.xml?rev=1555876&r1=1555875&r2=1555876&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.xml Mon Jan 6 16:02:57 2014
@@ -2096,7 +2096,8 @@ SSLUserName SSL_CLIENT_S_DN_CN
<directivesynopsis>
<name>SSLHonorCipherOrder</name>
<description>Option to prefer the server's cipher preference order</description>
-<syntax>SSLHonorCipherOrder <em>flag</em></syntax>
+<syntax>SSLHonorCipherOrder on|off</syntax>
+<default>SSLHonorCipherOrder off</default>
<contextlist><context>server config</context>
<context>virtual host</context></contextlist>
<compatibility>Available in Apache 2.1 and later, if using OpenSSL 0.9.7 or later</compatibility>
@@ -2143,7 +2144,8 @@ SSLCryptoDevice ubsec
<directivesynopsis>
<name>SSLOCSPEnable</name>
<description>Enable OCSP validation of the client certificate chain</description>
-<syntax>SSLOCSPEnable <em>flag</em></syntax>
+<syntax>SSLOCSPEnable on|off</syntax>
+<default>SSLOCSPEnable off</default>
<contextlist><context>server config</context>
<context>virtual host</context></contextlist>
<compatibility>Available in httpd 2.3 and later, if using OpenSSL 0.9.7 or later</compatibility>
@@ -2190,7 +2192,8 @@ the certificate being verified.</p>
<directivesynopsis>
<name>SSLOCSPOverrideResponder</name>
<description>Force use of the default responder URI for OCSP validation</description>
-<syntax>SSLOCSPOverrideResponder <em>flag</em></syntax>
+<syntax>SSLOCSPOverrideResponder on|off</syntax>
+<default>SSLOCSPOverrideResponder off</default>
<contextlist><context>server config</context>
<context>virtual host</context></contextlist>
<compatibility>Available in httpd 2.3 and later, if using OpenSSL 0.9.7 or later</compatibility>
@@ -2252,7 +2255,7 @@ which means that OCSP responses are cons
<directivesynopsis>
<name>SSLInsecureRenegotiation</name>
<description>Option to enable support for insecure renegotiation</description>
-<syntax>SSLInsecureRenegotiation <em>flag</em></syntax>
+<syntax>SSLInsecureRenegotiation on|off</syntax>
<default>SSLInsecureRenegotiation off</default>
<contextlist><context>server config</context>
<context>virtual host</context></contextlist>