You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2015/07/24 14:08:32 UTC
svn commit: r1692485 - in /httpd/test/mod_h2/trunk/conf/sites:
aaa-noh2.example.org.conf test-ser.example.org.conf test.example.org.conf
Author: icing
Date: Fri Jul 24 12:08:32 2015
New Revision: 1692485
URL: http://svn.apache.org/r1692485
Log:
updated mod_h2 tests for new Protocols directive
Modified:
httpd/test/mod_h2/trunk/conf/sites/aaa-noh2.example.org.conf
httpd/test/mod_h2/trunk/conf/sites/test-ser.example.org.conf
httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf
Modified: httpd/test/mod_h2/trunk/conf/sites/aaa-noh2.example.org.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/sites/aaa-noh2.example.org.conf?rev=1692485&r1=1692484&r2=1692485&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/sites/aaa-noh2.example.org.conf (original)
+++ httpd/test/mod_h2/trunk/conf/sites/aaa-noh2.example.org.conf Fri Jul 24 12:08:32 2015
@@ -8,6 +8,7 @@
<VirtualHost *:SUBST_PORT_HTTPS_SUBST>
ServerName noh2.example.org
DocumentRoot "SUBST_SERVER_ROOT_SUBST/htdocs/test.example.org"
+ Protocols http/1.1
SSLEngine on
SSLCertificateFile conf/ssl/noh2.example.org.pem
@@ -16,10 +17,6 @@
RewriteEngine on
RewriteRule ^/latest.tar.gz$ /xxx-1.0.2a.tar.gz [R=302,NC]
- <IfModule h2_module>
- H2Engine off
- </IfModule>
-
<Location /hello.py>
SSLOptions +StdEnvVars
</Location>
@@ -37,12 +34,9 @@
<VirtualHost *:SUBST_PORT_HTTP_SUBST>
ServerName noh2.example.org:SUBST_PORT_HTTP_SUBST
DocumentRoot "SUBST_SERVER_ROOT_SUBST/htdocs/test.example.org"
+ Protocols http/1.1
RewriteEngine on
RewriteRule ^/latest.tar.gz$ /xxx-1.0.2a.tar.gz [R=302,NC]
- <IfModule h2_module>
- H2Engine off
- </IfModule>
-
</VirtualHost>
Modified: httpd/test/mod_h2/trunk/conf/sites/test-ser.example.org.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/sites/test-ser.example.org.conf?rev=1692485&r1=1692484&r2=1692485&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/sites/test-ser.example.org.conf (original)
+++ httpd/test/mod_h2/trunk/conf/sites/test-ser.example.org.conf Fri Jul 24 12:08:32 2015
@@ -10,6 +10,7 @@
<VirtualHost *:SUBST_PORT_HTTPS_SUBST>
ServerName test-ser.example.org
DocumentRoot "SUBST_SERVER_ROOT_SUBST/htdocs/test.example.org"
+ Protocols h2 http/1.1
SSLEngine on
SSLProtocol +TLSv1 +TLSv1.1 +TLSv1.2
@@ -22,7 +23,6 @@
RewriteRule ^/latest.tar.gz$ /xxx-1.0.2a.tar.gz [R=302,NC]
<IfModule h2_module>
- H2Engine on
H2SerializeHeaders on
H2AltSvc h2=test-ser.example.org:SUBST_PORT_HTTPS_SUBST
H2AltSvc h2c=:12345
@@ -61,12 +61,12 @@
<VirtualHost *:SUBST_PORT_HTTP_SUBST>
ServerName test-ser.example.org:SUBST_PORT_HTTP_SUBST
DocumentRoot "SUBST_SERVER_ROOT_SUBST/htdocs/test.example.org"
+ Protocols h2c http/1.1
RewriteEngine on
RewriteRule ^/latest.tar.gz$ /xxx-1.0.2a.tar.gz [R=302,NC]
<IfModule h2_module>
- H2Engine on
H2SerializeHeaders on
</IfModule>
Modified: httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf?rev=1692485&r1=1692484&r2=1692485&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf (original)
+++ httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf Fri Jul 24 12:08:32 2015
@@ -22,6 +22,7 @@
<VirtualHost *:SUBST_PORT_HTTPS_SUBST>
ServerName test.example.org
DocumentRoot "SUBST_SERVER_ROOT_SUBST/htdocs/test.example.org"
+ Protocols h2 http/1.1
SSLEngine on
SSLProtocol +TLSv1 +TLSv1.1 +TLSv1.2
@@ -34,7 +35,6 @@
RewriteRule ^/latest.tar.gz$ /xxx-1.0.2a.tar.gz [R=302,NC]
<IfModule h2_module>
- H2Engine on
H2AltSvc h2=test.example.org:12346
H2AltSvc h2c=:12345
H2AltSvc h2=mod-h2.greenbytes.de:12346
@@ -79,14 +79,11 @@
<VirtualHost *:SUBST_PORT_HTTP_SUBST>
ServerName test.example.org:SUBST_PORT_HTTP_SUBST
DocumentRoot "SUBST_SERVER_ROOT_SUBST/htdocs/test.example.org"
+ Protocols h2c http/1.1
RewriteEngine on
RewriteRule ^/latest.tar.gz$ /xxx-1.0.2a.tar.gz [R=302,NC]
- <IfModule h2_module>
- H2Engine on
- </IfModule>
-
<Location /proxy/>
ProxyPass http://test.example.org:SUBST_PORT_HTTP_SUBST/
ProxyPassReverse http://test.example.org:SUBST_PORT_HTTP_SUBST/