svn commit: r1710837 - /subversion/trunk/win-tests.py

[rh...@apache.org]

Author: rhuijben
Date: Tue Oct 27 15:19:38 2015
New Revision: 1710837

URL: http://svn.apache.org/viewvc?rev=1710837&view=rev
Log:
Following up on r1710707 and r1709585 extend the httpd configuration file
a tiny bit.

* win-tests.py
  (Httpd): Disable ssl2 and ssl3. Explicitly enable h2direct for http/2.

Modified:
    subversion/trunk/win-tests.py

Modified: subversion/trunk/win-tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/win-tests.py?rev=1710837&r1=1710836&r2=1710837&view=diff
==============================================================================
--- subversion/trunk/win-tests.py (original)
+++ subversion/trunk/win-tests.py Tue Oct 27 15:19:38 2015
@@ -592,6 +592,7 @@ class Httpd:
 
     if use_ssl:
       fp.write('SSLEngine on\n')
+      fp.write('SSLProtocol All -SSLv2 -SSLv3\n')
       fp.write('SSLCertificateFile %s\n' % self._quote(self.certfile))
       fp.write('SSLCertificateKeyFile %s\n' % self._quote(self.certkeyfile))
 
@@ -599,6 +600,7 @@ class Httpd:
       fp.write('Protocols h2 http/1.1\n')
     elif use_http2:
       fp.write('Protocols h2c http/1.1\n')
+      fp.write('H2Direct on\n')
 
     # Don't handle .htaccess, symlinks, etc.
     fp.write('<Directory />\n')