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 2016/06/15 14:45:09 UTC
svn commit: r1748589 - in /httpd/test/mod_h2/trunk:
conf/sites/test.example.org.conf test/test_upgrade.sh
Author: icing
Date: Wed Jun 15 14:45:09 2016
New Revision: 1748589
URL: http://svn.apache.org/viewvc?rev=1748589&view=rev
Log:
adding Header unset Upgrade to test config, adding checks
Modified:
httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf
httpd/test/mod_h2/trunk/test/test_upgrade.sh
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=1748589&r1=1748588&r2=1748589&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 Wed Jun 15 14:45:09 2016
@@ -42,6 +42,7 @@
H2AltSvc h2=test.example.org:12346
H2AltSvc h2c=:12345
H2AltSvc h2=mod-h2.greenbytes.de:12346
+ Header unset Upgrade
</IfModule>
<Location /006-push.html>
Modified: httpd/test/mod_h2/trunk/test/test_upgrade.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_upgrade.sh?rev=1748589&r1=1748588&r2=1748589&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_upgrade.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_upgrade.sh Wed Jun 15 14:45:09 2016
@@ -26,23 +26,16 @@ URL_HTTP="$1"
URL_HTTPS="$2"
URL_PREFIX="$URL_HTTP"
-
# should see an announcement of h2c
#
curl_check_upgrade index.html "Upgrade: h2c" "expecting h2c"
curl_check_upgrade index.html "" "expecting none (not configured)" -H'Host: noh2.example.org'
curl_check_upgrade index.html "" "expecting none (less perferred)" -H'Host: test2.example.org'
-
-
URL_PREFIX="$URL_HTTPS"
-
-# should see an announcement of h2
+# should see no announcement of h2
#
-if min_version 2.5.0; then
- curl_check_upgrade index.html "" "expecting none (forbidden by httpwg)" --http1.1
-else
- curl_check_upgrade index.html "Upgrade: h2" "expecting h2" --http1.1
-fi
+curl_check_upgrade index.html "" "expecting none (suppressed via 'Header unset')" --http1.1
curl_check_upgrade index.html "" "expecting none (not configured)" -H'Host: noh2.example.org'
curl_check_upgrade index.html "" "expecting none (less perferred)" -H'Host: test2.example.org'
+curl_check_upgrade index.html "Upgrade: h2" "expecting h2 (not supressed)" --http1.1 -H'Host: test4.example.org'