You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2020/02/20 08:47:24 UTC
svn commit: r1874244 - in /httpd/httpd/branches/2.4.x: ./
docs/manual/mod/mod_ssl.xml
Author: jorton
Date: Thu Feb 20 08:47:24 2020
New Revision: 1874244
URL: http://svn.apache.org/viewvc?rev=1874244&view=rev
Log:
Merge r1874243 from trunk:
PKCS#11 URIs usable from 2.4.42 and later now. [skip ci]
Modified:
httpd/httpd/branches/2.4.x/ (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:r1874243
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=1874244&r1=1874243&r2=1874244&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 Thu Feb 20 08:47:24 2020
@@ -899,7 +899,7 @@ SSLCipherSuite RSA:!EXP:!NULL:+HIGH:+MED
<syntax>SSLCertificateFile <var>file-path</var>|<var>certid</var></syntax>
<contextlist><context>server config</context>
<context>virtual host</context></contextlist>
-<compatibility><var>certid</var> available in 2.5.1 and later.</compatibility>
+<compatibility><var>certid</var> available in 2.4.42 and later.</compatibility>
<usage>
<p>
@@ -1016,7 +1016,7 @@ SSLCertificateFile "pkcs11:token=My%20To
<syntax>SSLCertificateKeyFile <var>file-path</var>|<var>keyid</var></syntax>
<contextlist><context>server config</context>
<context>virtual host</context></contextlist>
-<compatibility><var>keyid</var> available in 2.5.1 and later.</compatibility>
+<compatibility><var>keyid</var> available in 2.4.42 and later.</compatibility>
<usage>
<p>