Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 81447200BBC for ; Sun, 13 Nov 2016 22:51:02 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7FD9A160AF8; Sun, 13 Nov 2016 21:51:02 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7E76B160AE4 for ; Sun, 13 Nov 2016 22:51:01 +0100 (CET) Received: (qmail 62256 invoked by uid 500); 13 Nov 2016 21:51:00 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 62247 invoked by uid 99); 13 Nov 2016 21:51:00 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Nov 2016 21:51:00 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 412DFC1917 for ; Sun, 13 Nov 2016 21:51:00 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.801 X-Spam-Level: X-Spam-Status: No, score=0.801 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_BADIPHTTP=2, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 2J6WnHIFnUQs for ; Sun, 13 Nov 2016 21:50:57 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id F2F5E5F570 for ; Sun, 13 Nov 2016 21:50:56 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id ED4BDE0290 for ; Sun, 13 Nov 2016 21:50:55 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 89BA73A0B14 for ; Sun, 13 Nov 2016 21:50:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1769552 - in /httpd/test/mod_h2/trunk: conf/ conf/sites/ htdocs/test.example.org/ test/ Date: Sun, 13 Nov 2016 21:50:55 -0000 To: cvs@httpd.apache.org From: icing@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161113215055.89BA73A0B14@svn01-us-west.apache.org> archived-at: Sun, 13 Nov 2016 21:51:02 -0000 Author: icing Date: Sun Nov 13 21:50:54 2016 New Revision: 1769552 URL: http://svn.apache.org/viewvc?rev=1769552&view=rev Log: new push tests Removed: httpd/test/mod_h2/trunk/htdocs/test.example.org/006-push.html httpd/test/mod_h2/trunk/htdocs/test.example.org/006-push2.html httpd/test/mod_h2/trunk/htdocs/test.example.org/006-push3.html httpd/test/mod_h2/trunk/htdocs/test.example.org/006-push4.html httpd/test/mod_h2/trunk/htdocs/test.example.org/006-push5.html httpd/test/mod_h2/trunk/htdocs/test.example.org/006-push6.html httpd/test/mod_h2/trunk/htdocs/test.example.org/006-push7.html httpd/test/mod_h2/trunk/htdocs/test.example.org/006-push8.html Modified: httpd/test/mod_h2/trunk/conf/httpd.conf httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf httpd/test/mod_h2/trunk/htdocs/test.example.org/necho.py httpd/test/mod_h2/trunk/test/test.sh httpd/test/mod_h2/trunk/test/test_push.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=1769552&r1=1769551&r2=1769552&view=diff ============================================================================== --- httpd/test/mod_h2/trunk/conf/httpd.conf (original) +++ httpd/test/mod_h2/trunk/conf/httpd.conf Sun Nov 13 21:50:54 2016 @@ -78,7 +78,10 @@ DocumentRoot "SUBST_SERVER_ROOT_SUBST/ht ProxyTimeout 30 SSLProxyEngine on - BalancerMember "http://127.0.0.1:SUBST_PORT_HTTP_SUBST" + BalancerMember "http://test.example.org:SUBST_PORT_HTTP_SUBST" + + + BalancerMember "https://test.example.org:SUBST_PORT_HTTPS_SUBST" @@ -143,6 +146,9 @@ DocumentRoot "SUBST_SERVER_ROOT_SUBST/ht BalancerMember "h2c://test.example.org:SUBST_PORT_HTTP_SUBST" + + BalancerMember "h2://nghttp2.org" + ################################################################################ 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=1769552&r1=1769551&r2=1769552&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 Sun Nov 13 21:50:54 2016 @@ -33,14 +33,17 @@ Timeout 2 KeepAliveTimeout 10 + ProxyTimeout 10 SSLEngine on SSLCertificateFile conf/ssl/test.example.org.pem SSLCertificateKeyFile conf/ssl/test.example.org.key + RedirectMatch 301 "/permanent(.*)" "$1" + RedirectMatch 302 "/temporary(.*)" "$1" + RewriteEngine on RewriteRule ^/latest.tar.gz$ /xxx-1.0.2a.tar.gz [R=302,NC] - ProxyTimeout 10 H2Direct on @@ -56,6 +59,7 @@ + RewriteRule ^/006-push(.*)?\.html$ /006.html Header add Link ";rel=preload" Header add Link ";rel=preloadX" @@ -96,17 +100,24 @@ Header add Link ";rel=preload" Header add Link ";rel=preload" - + + = 2.4.24> + + H2PushResource "https://test.example.org:SUBST_PORT_HTTPS_SUBST/006/006.css" critical + H2PushResource "/006/006.js" + + + H2PushResource "/006/006.css" critical + H2PushResource "/006/006.js" + + + SSLOptions +StdEnvVars - - BalancerMember "https://test.example.org:SUBST_PORT_HTTPS_SUBST" - ProxyPass "/proxy" "balancer://https-local" ProxyPassReverse "/proxy" "balancer://https-local" - # proxy rewrite RewriteRule /rewrite(.*) https://test.example.org:SUBST_PORT_HTTPS_SUBST$1 [P] # internal redirect rewrite @@ -118,7 +129,6 @@ Order allow,deny Allow from all - ProxyPass /zeit http://www.zeit.de:80 max=20 ttl=120 retry=300 SetHandler http2-status @@ -151,6 +161,8 @@ ProxyPass "/h2cproxy" "balancer://h2c-local" ProxyPassReverse "/h2cproxy" "balancer://h2c-local" RewriteRule /h2cproxy-rewrite(.*) h2c://test.example.org:SUBST_PORT_HTTP_SUBST$1 [P] + ProxyPass "/nghttp2" "balancer://nghttp2" + ProxyPassReverse "/nghttp2" "balancer://nghttp2" = 2.4.19> @@ -172,19 +184,13 @@ RewriteEngine on RewriteRule ^/latest.tar.gz$ /xxx-1.0.2a.tar.gz [R=302,NC] - ProxyPass "/proxy" "balancer://http-local" - ProxyPassReverse "/proxy" "balancer://http-local" - # proxy rewrite - RewriteRule /rewrite(.*) http://test.example.org:SUBST_PORT_HTTP_SUBST$1 [P] - # internal redirect rewrite - RewriteRule /redirect(.*) $1 [PT] - = 2.4.24> H2CopyFiles On + RewriteRule ^/006-push(.*)?\.html$ /006.html Header add Link ";rel=preload" Header add Link ";rel=preloadX" @@ -226,6 +232,24 @@ Header add Link ";rel=preload" + = 2.4.24> + + H2PushResource "http://test.example.org:SUBST_PORT_HTTP_SUBST/006/006.css" critical + H2PushResource "/006/006.js" + + + H2PushResource "/006/006.css" critical + H2PushResource "/006/006.js" + + + + ProxyPass "/proxy" "balancer://http-local" + ProxyPassReverse "/proxy" "balancer://http-local" + # proxy rewrite + RewriteRule /rewrite(.*) http://test.example.org:SUBST_PORT_HTTP_SUBST$1 [P] + # internal redirect rewrite + RewriteRule /redirect(.*) $1 [PT] + ProxyPass "/h2proxy" "balancer://h2-local" ProxyPassReverse "/h2proxy" "balancer://h2-local" Modified: httpd/test/mod_h2/trunk/htdocs/test.example.org/necho.py URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/htdocs/test.example.org/necho.py?rev=1769552&r1=1769551&r2=1769552&view=diff ============================================================================== --- httpd/test/mod_h2/trunk/htdocs/test.example.org/necho.py (original) +++ httpd/test/mod_h2/trunk/htdocs/test.example.org/necho.py Sun Nov 13 21:50:54 2016 @@ -23,7 +23,7 @@ Content-Type: text/plain\n""" else: print "Status: 400 Parameter Missing" print """\ - Content-Type: text/html\n +Content-Type: text/html\n

No count was specified: %s

""" % (count.value,) Modified: httpd/test/mod_h2/trunk/test/test.sh URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test.sh?rev=1769552&r1=1769551&r2=1769552&view=diff ============================================================================== --- httpd/test/mod_h2/trunk/test/test.sh (original) +++ httpd/test/mod_h2/trunk/test/test.sh Sun Nov 13 21:50:54 2016 @@ -49,25 +49,6 @@ min_version2() return 1 } -export TEST_GO=no -case "$(type -p go)" in - *go) - goversion=$(go version) - goversion=${goversion##go version go} - goversion=${goversion%% *} - gov=${goversion%%rc*} # trim release candidates - if min_version2 1.6 "$gov"; then - echo "go tests: enabled, version=$goversion" - export TEST_GO=yes - else - echo "go tests: disabled, version $goversion < 1.7" - fi - ;; - *) - echo "go tests: disabled, go executable not found" - ;; -esac - $SHELL "$TEST_DIR"/test_curl_altsvc.sh $HTTP_AUTH $HTTPS_AUTH && $SHELL "$TEST_DIR"/test_proto_order.sh $HTTPS_AUTH $HTTPS_AUTH_2 && $SHELL "$TEST_DIR"/test_alt_host.sh $HTTPS_AUTH $HTTPS_AUTH_2 && @@ -75,6 +56,8 @@ $SHELL "$TEST_DIR"/test_ssl.sh $ $SHELL "$TEST_DIR"/test_upgrade.sh $HTTP_AUTH $HTTPS_AUTH && $SHELL "$TEST_DIR"/test_header.sh $HTTPS_AUTH && $SHELL "$TEST_DIR"/test_debug.sh $HTTPS_AUTH && +$SHELL "$TEST_DIR"/test_push.sh $HTTPS_AUTH && +$SHELL "$TEST_DIR"/test_push.sh $HTTP_AUTH && $SHELL "$TEST_DIR"/test_intermediates.sh $HTTPS_AUTH && $SHELL "$TEST_DIR"/test_intermediates.sh $HTTPS_AUTH/proxy && $SHELL "$TEST_DIR"/test_intermediates.sh $HTTPS_AUTH/rewrite && @@ -85,15 +68,9 @@ $SHELL "$TEST_DIR"/test_nghttp_post.sh $ $SHELL "$TEST_DIR"/test_curl_get.sh $HTTPS_AUTH && $SHELL "$TEST_DIR"/test_curl_post.sh $HTTPS_AUTH ||fail -if test "$TEST_GO" = "yes"; then - # starting go client tests, still hangs with 1.7rc4, see - $SHELL "$TEST_DIR"/go/test_get.sh $HTTPS_AUTH || fail -fi - $SHELL "$TEST_DIR"/test_vars.sh $HTTPS_AUTH && $SHELL "$TEST_DIR"/test_window_update.sh $HTTP_AUTH_2 && $SHELL "$TEST_DIR"/test_header.sh $HTTPS_AUTH && -$SHELL "$TEST_DIR"/test_push.sh $HTTPS_AUTH && $SHELL "$TEST_DIR"/test_trailer.sh $HTTPS_AUTH && $SHELL "$TEST_DIR"/test_nghttp_get.sh $HTTPS_AUTH/proxy alpn "HTTP/1.1" && $SHELL "$TEST_DIR"/test_nghttp_post.sh $HTTPS_AUTH/proxy alpn "HTTP/1.1" && @@ -111,7 +88,6 @@ $SHELL "$TEST_DIR"/test_nghttp_get.sh $ $SHELL "$TEST_DIR"/test_nghttp_post.sh $HTTP_AUTH && $SHELL "$TEST_DIR"/test_curl_get.sh $HTTP_AUTH && $SHELL "$TEST_DIR"/test_curl_post.sh $HTTP_AUTH && -$SHELL "$TEST_DIR"/test_push.sh $HTTP_AUTH && $SHELL "$TEST_DIR"/test_trailer.sh $HTTP_AUTH && $SHELL "$TEST_DIR"/test_nghttp_get.sh $HTTP_AUTH direct && $SHELL "$TEST_DIR"/test_nghttp_post.sh $HTTP_AUTH direct && @@ -131,6 +107,30 @@ $SHELL "$TEST_DIR"/test_nghttp_get.sh $ $SHELL "$TEST_DIR"/test_nghttp_post.sh $HTTPS_AUTH_SER alpn "HTTP/1.1" && $SHELL "$TEST_DIR"/test_curl_get.sh $HTTPS_AUTH_SER alpn "HTTP/1.1" && $SHELL "$TEST_DIR"/test_curl_post.sh $HTTPS_AUTH_SER alpn "HTTP/1.1" && -$SHELL "$TEST_DIR"/test_trailer.sh $HTTPS_AUTH_SER && -: +$SHELL "$TEST_DIR"/test_trailer.sh $HTTPS_AUTH_SER || +fail + +export TEST_GO=no +case "$(type -p go)" in + *go) + goversion=$(go version) + goversion=${goversion##go version go} + goversion=${goversion%% *} + gov=${goversion%%rc*} # trim release candidates + if min_version2 1.6 "$gov"; then + echo "go tests: enabled, version=$goversion" + export TEST_GO=yes + else + echo "go tests: disabled, version $goversion < 1.7" + fi + ;; + *) + echo "go tests: disabled, go executable not found" + ;; +esac + +if test "$TEST_GO" = "yes"; then + # starting go client tests, still hangs with 1.7rc4, see + $SHELL "$TEST_DIR"/go/test_get.sh $HTTPS_AUTH || fail +fi Modified: httpd/test/mod_h2/trunk/test/test_push.sh URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_push.sh?rev=1769552&r1=1769551&r2=1769552&view=diff ============================================================================== --- httpd/test/mod_h2/trunk/test/test_push.sh (original) +++ httpd/test/mod_h2/trunk/test/test_push.sh Sun Nov 13 21:50:54 2016 @@ -27,75 +27,75 @@ URL_PREFIX="$1" if min_httpd_version 2.4.18; then # 2 link headers nghttp_check_fcontent 006-push.html "get 006-push" <' link termination nghttp_check_fcontent 006-push4.html "get 006-push4" <= 2.4.19" fi + if min_httpd_version 2.4.24; then + # test H2PushResource directive and 103 response support + + nghttp_check_pushed 006-push9.html "push9" <= 2.4.24" + fi else echo "push tests require httpd >= 2.4.18" fi +