httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1740109 - in /httpd/test/mod_h2/trunk/test: test_alt_host.sh test_common.sh
Date Wed, 20 Apr 2016 11:05:30 GMT
Author: icing
Date: Wed Apr 20 11:05:30 2016
New Revision: 1740109

URL: http://svn.apache.org/viewvc?rev=1740109&view=rev
Log:
test adaptations for HTTP/2.0 SERVER_PROTOCOL

Modified:
    httpd/test/mod_h2/trunk/test/test_alt_host.sh
    httpd/test/mod_h2/trunk/test/test_common.sh

Modified: httpd/test/mod_h2/trunk/test/test_alt_host.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_alt_host.sh?rev=1740109&r1=1740108&r2=1740109&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_alt_host.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_alt_host.sh Wed Apr 20 11:05:30 2016
@@ -50,7 +50,7 @@ curl_check_content hello.py "serveralias
 <body>
 <h2>Hello World!</h2>
 HTTPS=on<br/>
-PROTOCOL=HTTP/2<br/>
+PROTOCOL=${HTTP2_PROTOCOL}<br/>
 SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
 HTTP2=${EXP_HTTP2}<br/>
 H2PUSH=${EXP_H2PUSH}<br/>
@@ -66,7 +66,7 @@ curl_check_content hello.py "test2 host"
 <body>
 <h2>Hello World!</h2>
 HTTPS=on<br/>
-PROTOCOL=HTTP/2<br/>
+PROTOCOL=${HTTP2_PROTOCOL}<br/>
 SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
 HTTP2=${EXP_HTTP2}<br/>
 H2PUSH=${EXP_H2PUSH}<br/>

Modified: httpd/test/mod_h2/trunk/test/test_common.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_common.sh?rev=1740109&r1=1740108&r2=1740109&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_common.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_common.sh Wed Apr 20 11:05:30 2016
@@ -19,7 +19,8 @@
 
 URL_PREFIX="$1"
 OPT_DIRECT="$2"
-EXP_PROTOCOL="${3:-HTTP/2}"
+EXP_PROTOCOL="${3:-DEFAULT}"
+
 EXP_H1_PROTOCOL="HTTP/1.1"
 EXP_SSL_PROTOCOL=""
 EXP_HTTPS=""
@@ -74,6 +75,15 @@ fail() {
     exit 1
 }
 
+if min_version 2.4.21; then
+    HTTP2_PROTOCOL="HTTP/2.0"
+else
+    HTTP2_PROTOCOL="HTTP/2"
+fi
+if test "$EXP_PROTOCOL" = "DEFAULT"; then
+    EXP_PROTOCOL="$HTTP2_PROTOCOL"
+fi
+
 if min_version 2.4.19; then
     case "$URL_PREFIX" in 
         */proxy|*/rewrite)
@@ -108,14 +118,14 @@ case "$URL_PREFIX" in
         ;;
     */h2proxy)
         EXP_HTTPS="on"
-        EXP_PROTOCOL="HTTP/2"
+        EXP_PROTOCOL="${HTTP2_PROTOCOL}"
         EXP_H1_PROTOCOL="${EXP_PROTOCOL}"
         EXP_SSL_PROTOCOL="TLSv1.2"
         ;;
     */h2cproxy)
         EXP_HTTPS=""
         EXP_SSL_PROTOCOL=""
-        EXP_PROTOCOL="HTTP/2"
+        EXP_PROTOCOL="${HTTP2_PROTOCOL}"
         EXP_H1_PROTOCOL="${EXP_PROTOCOL}"
         ;;
     *)



Mime
View raw message