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/12/04 12:57:05 UTC
svn commit: r1717939 - in /httpd/test/mod_h2/trunk:
htdocs/test.example.org/hello.py test/test_alt_host.sh test/test_common.sh
test/test_curl_get.sh test/test_nghttp_get.sh
Author: icing
Date: Fri Dec 4 11:57:05 2015
New Revision: 1717939
URL: http://svn.apache.org/viewvc?rev=1717939&view=rev
Log:
verifying that HTTPS environment variable is set correctly
Modified:
httpd/test/mod_h2/trunk/htdocs/test.example.org/hello.py
httpd/test/mod_h2/trunk/test/test_alt_host.sh
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/htdocs/test.example.org/hello.py
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/htdocs/test.example.org/hello.py?rev=1717939&r1=1717938&r2=1717939&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 Fri Dec 4 11:57:05 2015
@@ -8,6 +8,7 @@ print """\
<html>
<body>
<h2>Hello World!</h2>"""
+print "HTTPS=" + os.getenv('HTTPS', '') + "<br/>"
print "PROTOCOL=" + os.getenv('SERVER_PROTOCOL', '') + "<br/>"
print "SSL_PROTOCOL=" + os.getenv('SSL_PROTOCOL', '') + "<br/>"
print """</body>
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=1717939&r1=1717938&r2=1717939&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_alt_host.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_alt_host.sh Fri Dec 4 11:57:05 2015
@@ -49,6 +49,7 @@ curl_check_content hello.py "serveralias
<html>
<body>
<h2>Hello World!</h2>
+HTTPS=on<br/>
PROTOCOL=HTTP/2<br/>
SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
</body>
@@ -62,6 +63,7 @@ curl_check_content hello.py "test2 host"
<html>
<body>
<h2>Hello World!</h2>
+HTTPS=on<br/>
PROTOCOL=HTTP/2<br/>
SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
</body>
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=1717939&r1=1717938&r2=1717939&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_common.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_common.sh Fri Dec 4 11:57:05 2015
@@ -21,6 +21,7 @@ URL_PREFIX="$1"
OPT_DIRECT="$2"
EXP_PROTOCOL="${3:-HTTP/2}"
EXP_SSL_PROTOCOL=""
+EXP_HTTPS=""
AUTH="${URL_PREFIX#*://}"
HOST="${AUTH%%:*}"
@@ -32,6 +33,7 @@ fi
if [ "$URL_SCHEME" = "https" ]; then
EXP_SSL_PROTOCOL="TLSv1.2"
+ EXP_HTTPS="on"
fi
INSTALL_DIR="${PREFIX:-gen/apache}"
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=1717939&r1=1717938&r2=1717939&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_curl_get.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_curl_get.sh Fri Dec 4 11:57:05 2015
@@ -42,6 +42,7 @@ curl_check_content hello.py "default" <<
<html>
<body>
<h2>Hello World!</h2>
+HTTPS=${EXP_HTTPS}<br/>
PROTOCOL=HTTP/1.1<br/>
SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
</body>
@@ -53,6 +54,7 @@ curl_check_content hello.py "http/1.1" -
<html>
<body>
<h2>Hello World!</h2>
+HTTPS=${EXP_HTTPS}<br/>
PROTOCOL=HTTP/1.1<br/>
SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
</body>
@@ -64,6 +66,7 @@ curl_check_content hello.py "http2" -
<html>
<body>
<h2>Hello World!</h2>
+HTTPS=${EXP_HTTPS}<br/>
PROTOCOL=${EXP_PROTOCOL}<br/>
SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
</body>
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=1717939&r1=1717938&r2=1717939&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_nghttp_get.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_nghttp_get.sh Fri Dec 4 11:57:05 2015
@@ -261,6 +261,7 @@ nghttp_check_content hello.py "get hello
<html>
<body>
<h2>Hello World!</h2>
+HTTPS=${EXP_HTTPS}<br/>
PROTOCOL=${EXP_PROTOCOL}<br/>
SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
</body>