equal
deleted
inserted
replaced
1 Patch origin: in-house |
1 Patch origin: in-house |
2 Patch status: will be submitted to upstream |
2 Patch status: unclear; so far they disable it just in configuration file |
|
3 |
|
4 https://bz.apache.org/bugzilla/show_bug.cgi?id=57120 |
3 |
5 |
4 --- modules/ssl/ssl_private.h |
6 --- modules/ssl/ssl_private.h |
5 +++ modules/ssl/ssl_private.h |
7 +++ modules/ssl/ssl_private.h |
6 @@ -298,10 +298,10 @@ |
8 @@ -298,10 +298,10 @@ |
7 #ifdef HAVE_TLSV1_X |
9 #ifdef HAVE_TLSV1_X |
16 #endif |
18 #endif |
17 typedef int ssl_proto_t; |
19 typedef int ssl_proto_t; |
18 |
20 |
19 --- docs/manual/mod/mod_ssl.html.en |
21 --- docs/manual/mod/mod_ssl.html.en |
20 +++ docs/manual/mod/mod_ssl.html.en |
22 +++ docs/manual/mod/mod_ssl.html.en |
21 @@ -1348,9 +1348,7 @@ |
23 @@ -1369,9 +1361,7 @@ |
22 |
24 |
23 <li><code>all</code> |
25 <li><code>all</code> |
24 <p> |
26 <p> |
25 - This is a shortcut for ``<code>+SSLv3 +TLSv1</code>'' or |
27 - This is a shortcut for ``<code>+SSLv3 +TLSv1</code>'' or |
26 - - when using OpenSSL 1.0.1 and later - |
28 - - when using OpenSSL 1.0.1 and later - |
29 </ul> |
31 </ul> |
30 <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">SSLProtocol TLSv1</pre> |
32 <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">SSLProtocol TLSv1</pre> |
31 </div> |
33 </div> |
32 --- docs/manual/mod/mod_ssl.html.fr |
34 --- docs/manual/mod/mod_ssl.html.fr |
33 +++ docs/manual/mod/mod_ssl.html.fr |
35 +++ docs/manual/mod/mod_ssl.html.fr |
34 @@ -1518,8 +1518,7 @@ |
36 @@ -1548,8 +1545,7 @@ |
35 |
37 |
36 <li><code>all</code> |
38 <li><code>all</code> |
37 <p> |
39 <p> |
38 - C'est un raccourci pour ``<code>+SSLv3 +TLSv1</code>'' ou - � partir |
40 - C'est un raccourci pour ``<code>+SSLv3 +TLSv1</code>'' ou - � partir |
39 - de la version 1.0.1 d'OpenSSL - ``<code>+SSLv3 +TLSv1 +TLSv1.1 +TLSv1.2</code>.</p></li> |
41 - de la version 1.0.1 d'OpenSSL - ``<code>+SSLv3 +TLSv1 +TLSv1.1 +TLSv1.2</code>.</p></li> |