httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1702918 - in /httpd/test/mod_h2/trunk: Makefile.am htdocs/test.example.org/hello.py test/test_common.sh test/test_curl_get.sh test/test_nghttp_get.sh
Date Mon, 14 Sep 2015 12:24:17 GMT
Author: icing
Date: Mon Sep 14 12:24:17 2015
New Revision: 1702918

URL: http://svn.apache.org/r1702918
Log:
testing server protocols reported

Modified:
    httpd/test/mod_h2/trunk/Makefile.am
    httpd/test/mod_h2/trunk/htdocs/test.example.org/hello.py
    httpd/test/mod_h2/trunk/test/test_common.sh
    httpd/test/mod_h2/trunk/test/test_curl_get.sh
    httpd/test/mod_h2/trunk/test/test_nghttp_get.sh

Modified: httpd/test/mod_h2/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/Makefile.am?rev=1702918&r1=1702917&r2=1702918&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/Makefile.am (original)
+++ httpd/test/mod_h2/trunk/Makefile.am Mon Sep 14 12:24:17 2015
@@ -121,32 +121,32 @@ test: \
 	@$(TESTRUN) test/test_nghttp_post.sh https://$(HTTPS_AUTH)
 	@$(TESTRUN) test/test_curl_get.sh    https://$(HTTPS_AUTH)
 	@$(TESTRUN) test/test_curl_post.sh   https://$(HTTPS_AUTH)
-	@$(TESTRUN) test/test_nghttp_get.sh  https://$(HTTPS_AUTH)/proxy
-	@$(TESTRUN) test/test_nghttp_post.sh https://$(HTTPS_AUTH)/proxy
-	@$(TESTRUN) test/test_curl_get.sh    https://$(HTTPS_AUTH)/proxy
-	@$(TESTRUN) test/test_curl_post.sh   https://$(HTTPS_AUTH)/proxy
-	@$(TESTRUN) test/test_nghttp_get.sh  https://$(HTTPS_AUTH)/rewrite
-	@$(TESTRUN) test/test_nghttp_post.sh https://$(HTTPS_AUTH)/rewrite
-	@$(TESTRUN) test/test_curl_get.sh    https://$(HTTPS_AUTH)/rewrite
-	@$(TESTRUN) test/test_curl_post.sh   https://$(HTTPS_AUTH)/rewrite
+	@$(TESTRUN) test/test_nghttp_get.sh  https://$(HTTPS_AUTH)/proxy alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_nghttp_post.sh https://$(HTTPS_AUTH)/proxy alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_curl_get.sh    https://$(HTTPS_AUTH)/proxy alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_curl_post.sh   https://$(HTTPS_AUTH)/proxy alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_nghttp_get.sh  https://$(HTTPS_AUTH)/rewrite alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_nghttp_post.sh https://$(HTTPS_AUTH)/rewrite alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_curl_get.sh    https://$(HTTPS_AUTH)/rewrite alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_curl_post.sh   https://$(HTTPS_AUTH)/rewrite alpn "HTTP/1.1"
 	@$(TESTRUN) test/test_nghttp_get.sh  http://$(HTTP_AUTH)
 	@$(TESTRUN) test/test_nghttp_post.sh http://$(HTTP_AUTH)
 	@$(TESTRUN) test/test_curl_get.sh    http://$(HTTP_AUTH)
 	@$(TESTRUN) test/test_curl_post.sh   http://$(HTTP_AUTH)
 	@$(TESTRUN) test/test_nghttp_get.sh  http://$(HTTP_AUTH) direct
 	@$(TESTRUN) test/test_nghttp_post.sh http://$(HTTP_AUTH) direct
-	@$(TESTRUN) test/test_nghttp_get.sh  http://$(HTTP_AUTH)/proxy
-	@$(TESTRUN) test/test_nghttp_post.sh http://$(HTTP_AUTH)/proxy
-	@$(TESTRUN) test/test_curl_get.sh    http://$(HTTP_AUTH)/proxy
-	@$(TESTRUN) test/test_curl_post.sh   http://$(HTTP_AUTH)/proxy
-	@$(TESTRUN) test/test_nghttp_get.sh  http://$(HTTP_AUTH)/rewrite
-	@$(TESTRUN) test/test_nghttp_post.sh http://$(HTTP_AUTH)/rewrite
-	@$(TESTRUN) test/test_curl_get.sh    http://$(HTTP_AUTH)/rewrite
-	@$(TESTRUN) test/test_curl_post.sh   http://$(HTTP_AUTH)/rewrite
-	@$(TESTRUN) test/test_nghttp_get.sh  https://$(HTTPS_AUTH_SER)
-	@$(TESTRUN) test/test_nghttp_post.sh https://$(HTTPS_AUTH_SER)
-	@$(TESTRUN) test/test_curl_get.sh    https://$(HTTPS_AUTH_SER)
-	@$(TESTRUN) test/test_curl_post.sh   https://$(HTTPS_AUTH_SER)
+	@$(TESTRUN) test/test_nghttp_get.sh  http://$(HTTP_AUTH)/proxy alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_nghttp_post.sh http://$(HTTP_AUTH)/proxy alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_curl_get.sh    http://$(HTTP_AUTH)/proxy alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_curl_post.sh   http://$(HTTP_AUTH)/proxy alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_nghttp_get.sh  http://$(HTTP_AUTH)/rewrite alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_nghttp_post.sh http://$(HTTP_AUTH)/rewrite alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_curl_get.sh    http://$(HTTP_AUTH)/rewrite alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_curl_post.sh   http://$(HTTP_AUTH)/rewrite alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_nghttp_get.sh  https://$(HTTPS_AUTH_SER) alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_nghttp_post.sh https://$(HTTPS_AUTH_SER) alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_curl_get.sh    https://$(HTTPS_AUTH_SER) alpn "HTTP/1.1"
+	@$(TESTRUN) test/test_curl_post.sh   https://$(HTTPS_AUTH_SER) alpn "HTTP/1.1"
 
 ################################################################################
 # Load Test

Modified: httpd/test/mod_h2/trunk/htdocs/test.example.org/hello.py
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/htdocs/test.example.org/hello.py?rev=1702918&r1=1702917&r2=1702918&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/htdocs/test.example.org/hello.py (original)
+++ httpd/test/mod_h2/trunk/htdocs/test.example.org/hello.py Mon Sep 14 12:24:17 2015
@@ -8,6 +8,7 @@ print """\
 <html>
 <body>
 <h2>Hello World!</h2>"""
-print "SSL_PROTOCOL=" + os.getenv('SSL_PROTOCOL', '')
+print "PROTOCOL=" + os.getenv('SERVER_PROTOCOL', '') + "<br/>"
+print "SSL_PROTOCOL=" + os.getenv('SSL_PROTOCOL', '') + "<br/>"
 print """</body>
 </html>"""
\ No newline at end of file

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=1702918&r1=1702917&r2=1702918&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_common.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_common.sh Mon Sep 14 12:24:17 2015
@@ -19,6 +19,9 @@
 
 URL_PREFIX="$1"
 OPT_DIRECT="$2"
+EXP_PROTOCOL="${3:-HTTP/2}"
+EXP_SSL_PROTOCOL=""
+
 AUTH="${URL_PREFIX#*://}"
 HOST="${AUTH%%:*}"
 URL_SCHEME="${URL_PREFIX%%:*}"
@@ -27,6 +30,10 @@ if [ "$URL_PATH" = "/$AUTH" ]; then
     URL_PATH=""
 fi
 
+if [ "$URL_SCHEME" = "https" ]; then
+    EXP_SSL_PROTOCOL="TLSv1.2"
+fi
+
 INSTALL_DIR="${PREFIX:-gen/apache}"
 BIN_DIR="${INSTALL_DIR}/bin"
 if [ "${HOST#*.}" = 'example.org' ]; then

Modified: httpd/test/mod_h2/trunk/test/test_curl_get.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_curl_get.sh?rev=1702918&r1=1702917&r2=1702918&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_curl_get.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_curl_get.sh Mon Sep 14 12:24:17 2015
@@ -36,32 +36,38 @@ fi
 ################################################################################
 # check cgi generated content
 ################################################################################
-if [ "$URL_SCHEME" = "https" ]; then
-    CONTENT="<html>
-<body>
-<h2>Hello World!</h2>
-SSL_PROTOCOL=TLSv1.2
-</body>
-</html>"
-else
-    CONTENT="<html>
+
+# as long as --http2 is not default, expect a plain HTTP/1.1 connection
+curl_check_content hello.py "default" <<EOF
+<html>
 <body>
 <h2>Hello World!</h2>
-SSL_PROTOCOL=
+PROTOCOL=HTTP/1.1<br/>
+SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
 </body>
-</html>"
-fi
-
-curl_check_content hello.py "default" <<EOF
-$CONTENT
+</html>
 EOF
 
+# force HTTP/1.1 connection
 curl_check_content hello.py "http/1.1" --http1.1 <<EOF
-$CONTENT
+<html>
+<body>
+<h2>Hello World!</h2>
+PROTOCOL=HTTP/1.1<br/>
+SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
+</body>
+</html>
 EOF
 
+# force HTTP/2 connection
 curl_check_content hello.py "http2"    --http2 <<EOF
-$CONTENT
+<html>
+<body>
+<h2>Hello World!</h2>
+PROTOCOL=${EXP_PROTOCOL}<br/>
+SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
+</body>
+</html>
 EOF
 
 

Modified: httpd/test/mod_h2/trunk/test/test_nghttp_get.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_nghttp_get.sh?rev=1702918&r1=1702917&r2=1702918&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_nghttp_get.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_nghttp_get.sh Mon Sep 14 12:24:17 2015
@@ -257,23 +257,13 @@ EOF
 # check cgi generated content
 ################################################################################
 
-if [ "$URL_SCHEME" = "https" ]; then
-    CONTENT="<html>
-<body>
-<h2>Hello World!</h2>
-SSL_PROTOCOL=TLSv1.2
-</body>
-</html>"
-else
-    CONTENT="<html>
+nghttp_check_content hello.py "get hello.py"   <<EOF
+<html>
 <body>
 <h2>Hello World!</h2>
-SSL_PROTOCOL=
+PROTOCOL=${EXP_PROTOCOL}<br/>
+SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
 </body>
-</html>"
-fi
-
-nghttp_check_content hello.py "get hello.py"   <<EOF
-$CONTENT
+</html>
 EOF
 



Mime
View raw message