Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1721120 - in /httpd/test/mod_h2/trunk: conf/httpd.conf
 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
Date: Mon, 21 Dec 2015 10:53:44 -0000
To: cvs@httpd.apache.org
From: icing@apache.org
Message-Id: <20151221105344.F294F3A0051@svn01-us-west.apache.org>

Author: icing
Date: Mon Dec 21 10:53:44 2015
New Revision: 1721120

URL: http://svn.apache.org/viewvc?rev=1721120&view=rev
Log:
added tests for new env vars HTTP2 and H2PUSH

Modified:
    httpd/test/mod_h2/trunk/conf/httpd.conf
    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/conf/httpd.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/httpd.conf?rev=1721120&r1=1721119&r2=1721120&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/httpd.conf (original)
+++ httpd/test/mod_h2/trunk/conf/httpd.conf Mon Dec 21 10:53:44 2015
@@ -106,6 +106,10 @@ MaxKeepAliveRequests 0
         H2PushPriority image/png              after        32
         H2PushPriority application/javascript interleaved
     </IfVersion>
+    <IfVersion >= 2.4.19>
+        H2Timeout 1
+        H2KeepAliveTimeout 5
+    </IfVersion>
 
 </IfModule>
 

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=1721120&r1=1721119&r2=1721120&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 Dec 21 10:53:44 2015
@@ -11,5 +11,7 @@ print """\
 print "HTTPS=" + os.getenv('HTTPS', '') + "<br/>"
 print "PROTOCOL=" + os.getenv('SERVER_PROTOCOL', '') + "<br/>"
 print "SSL_PROTOCOL=" + os.getenv('SSL_PROTOCOL', '') + "<br/>"
+print "HTTP2=" + os.getenv('HTTP2', '') + "<br/>"
+print "H2PUSH=" + os.getenv('H2PUSH', '') + "<br/>"
 print """</body>
 </html>"""
\ No newline at end of file

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=1721120&r1=1721119&r2=1721120&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_alt_host.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_alt_host.sh Mon Dec 21 10:53:44 2015
@@ -52,6 +52,8 @@ curl_check_content hello.py "serveralias
 HTTPS=on<br/>
 PROTOCOL=HTTP/2<br/>
 SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
+HTTP2=${EXP_HTTP2}<br/>
+H2PUSH=${EXP_H2PUSH}<br/>
 </body>
 </html>
 EOF
@@ -66,6 +68,8 @@ curl_check_content hello.py "test2 host"
 HTTPS=on<br/>
 PROTOCOL=HTTP/2<br/>
 SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
+HTTP2=on<br/>
+H2PUSH=on<br/>
 </body>
 </html>
 EOF

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=1721120&r1=1721119&r2=1721120&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_common.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_common.sh Mon Dec 21 10:53:44 2015
@@ -22,6 +22,8 @@ OPT_DIRECT="$2"
 EXP_PROTOCOL="${3:-HTTP/2}"
 EXP_SSL_PROTOCOL=""
 EXP_HTTPS=""
+EXP_HTTP2=""
+EXP_H2PUSH=""
 
 AUTH="${URL_PREFIX#*://}"
 HOST="${AUTH%%:*}"
@@ -70,6 +72,17 @@ fail() {
     exit 1
 }
 
+case "$URL_PREFIX" in 
+    */proxy|*/rewrite)
+        EXP_HTTP2=""
+        EXP_H2PUSH=""
+        ;;
+    *)
+        EXP_HTTP2="on"
+        EXP_H2PUSH="on"
+        ;;
+esac
+
 case "$OPT_DIRECT" in
   "direct")
         ARG_UPGRADE=""

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=1721120&r1=1721119&r2=1721120&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_curl_get.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_curl_get.sh Mon Dec 21 10:53:44 2015
@@ -45,6 +45,8 @@ curl_check_content hello.py "default" <<
 HTTPS=${EXP_HTTPS}<br/>
 PROTOCOL=HTTP/1.1<br/>
 SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
+HTTP2=<br/>
+H2PUSH=<br/>
 </body>
 </html>
 EOF
@@ -57,6 +59,8 @@ curl_check_content hello.py "http/1.1" -
 HTTPS=${EXP_HTTPS}<br/>
 PROTOCOL=HTTP/1.1<br/>
 SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
+HTTP2=<br/>
+H2PUSH=<br/>
 </body>
 </html>
 EOF
@@ -69,6 +73,8 @@ curl_check_content hello.py "http2"    -
 HTTPS=${EXP_HTTPS}<br/>
 PROTOCOL=${EXP_PROTOCOL}<br/>
 SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
+HTTP2=${EXP_HTTP2}<br/>
+H2PUSH=${EXP_H2PUSH}<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=1721120&r1=1721119&r2=1721120&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_nghttp_get.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_nghttp_get.sh Mon Dec 21 10:53:44 2015
@@ -264,6 +264,8 @@ nghttp_check_content hello.py "get hello
 HTTPS=${EXP_HTTPS}<br/>
 PROTOCOL=${EXP_PROTOCOL}<br/>
 SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
+HTTP2=${EXP_HTTP2}<br/>
+H2PUSH=${EXP_H2PUSH}<br/>
 </body>
 </html>
 EOF