svn commit: r1020645 - in /websites/staging/felix/trunk/content: ./ documentation/subprojects/apache-felix-http-service.html

[buildbot]

Author: buildbot
Date: Fri Nov 10 08:48:35 2017
New Revision: 1020645

Log:
Staging update by buildbot for felix

Modified:
    websites/staging/felix/trunk/content/   (props changed)
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-http-service.html

Propchange: websites/staging/felix/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Nov 10 08:48:35 2017
@@ -1 +1 @@
-1814589
+1814823

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-http-service.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-http-service.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-http-service.html
 Fri Nov 10 08:48:35 2017
@@ -504,6 +504,14 @@ properties can be used (some legacy prop
 <td>Configures comma-separated list of SSL cipher suites to <em>include</em>. 
Default is <code>null</code>, meaning that the default cipher suites are 
used.</td>
 </tr>
 <tr>
+<td><code>org.apache.felix.https.jetty.protocols.excluded</code></td>
+<td>Configures comma-separated list of SSL protocols (e.g. SSLv3, TLSv1.0, 
TLSv1.1, TLSv1.2) to <em>exclude</em>. Default is <code>null</code>, meaning 
that no protocol is excluded.</td>
+</tr>
+<tr>
+<td><code>org.apache.felix.https.jetty.protocols.included</code></td>
+<td>Configures comma-separated list of SSL protocols to <em>include</em>. 
Default is <code>null</code>, meaning that the default protocols are used.</td>
+</tr>
+<tr>
 <td><code>org.apache.felix.https.clientcertificate</code></td>
 <td>Flag to determine if the HTTPS protocol requires, wants or does not use 
client certificates. Legal values are <code>needs</code>, <code>wants</code> 
and <code>none</code>. The default is <code>none</code>.</td>
 </tr>
@@ -781,7 +789,7 @@ the provided <code>HttpContext</code> in
 <span class="nt">&lt;/dependency&gt;</span>
 </pre></div>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1814162 by cziegeler on Fri, 3 Nov 2017 10:47:32 +0000
+        Rev. 1814823 by nbartlett on Fri, 10 Nov 2017 08:47:51 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Felix, Felix, Apache, the Apache feather logo, and the Apache 
Felix project