Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DDD31184C9 for ; Fri, 20 Nov 2015 15:14:44 +0000 (UTC) Received: (qmail 56024 invoked by uid 500); 20 Nov 2015 15:14:44 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 55958 invoked by uid 500); 20 Nov 2015 15:14:44 -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 55949 invoked by uid 99); 20 Nov 2015 15:14:44 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Nov 2015 15:14:44 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 3B36EC13C2 for ; Fri, 20 Nov 2015 15:14:44 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id ofUGCYWmwNYA for ; Fri, 20 Nov 2015 15:14:30 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with ESMTP id C253520225 for ; Fri, 20 Nov 2015 15:14:29 +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 78E73E03E8 for ; Fri, 20 Nov 2015 15:14:29 +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 796493A075E for ; Fri, 20 Nov 2015 15:14:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1715373 - in /httpd/test/mod_h2/trunk/test: test_nghttp_post.sh test_push.sh test_renegotiate.sh test_trailer.sh Date: Fri, 20 Nov 2015 15:14:29 -0000 To: cvs@httpd.apache.org From: icing@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151120151429.796493A075E@svn01-us-west.apache.org> Author: icing Date: Fri Nov 20 15:14:29 2015 New Revision: 1715373 URL: http://svn.apache.org/viewvc?rev=1715373&view=rev Log: update version check for new mod_http2 in 2.4.x branch Modified: httpd/test/mod_h2/trunk/test/test_nghttp_post.sh httpd/test/mod_h2/trunk/test/test_push.sh httpd/test/mod_h2/trunk/test/test_renegotiate.sh httpd/test/mod_h2/trunk/test/test_trailer.sh Modified: httpd/test/mod_h2/trunk/test/test_nghttp_post.sh URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_nghttp_post.sh?rev=1715373&r1=1715372&r2=1715373&view=diff ============================================================================== --- httpd/test/mod_h2/trunk/test/test_nghttp_post.sh (original) +++ httpd/test/mod_h2/trunk/test/test_nghttp_post.sh Fri Nov 20 15:14:29 2015 @@ -72,7 +72,7 @@ nghttp_post_file upload.py $GEN/data-1m # Tests without content-length *and* without content-type announced -if min_version 2.5.0; then +if min_version 2.4.18; then nghttp_post_data echo.py $GEN/data-1k "1k upload w/o c-len+c-type" --no-content-length 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=1715373&r1=1715372&r2=1715373&view=diff ============================================================================== --- httpd/test/mod_h2/trunk/test/test_push.sh (original) +++ httpd/test/mod_h2/trunk/test/test_push.sh Fri Nov 20 15:14:29 2015 @@ -24,7 +24,7 @@ echo "test server push: $@" URL_PREFIX="$1" -if min_version 2.5.0; then +if min_version 2.4.18; then # 2 link headers nghttp_check_fcontent 006-push.html "get 006-push" <= 2.5.0" + echo "push tests require httpd >= 2.4.18" fi \ No newline at end of file Modified: httpd/test/mod_h2/trunk/test/test_renegotiate.sh URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_renegotiate.sh?rev=1715373&r1=1715372&r2=1715373&view=diff ============================================================================== --- httpd/test/mod_h2/trunk/test/test_renegotiate.sh (original) +++ httpd/test/mod_h2/trunk/test/test_renegotiate.sh Fri Nov 20 15:14:29 2015 @@ -37,7 +37,7 @@ curl_check_status ssl/renegotiate/cipher # nghttp gives RST_STREAM in verbose mode, check that the given urls # signal fallback to HTTP/1.1 # -if min_version 2.5.0; then +if min_version 2.4.18; then nghttp_check_rst_error ssl/renegotiate/cipher "HTTP_1_1_REQUIRED" "nghttp reneg cipher" nghttp_check_rst_error ssl/renegotiate/verify "HTTP_1_1_REQUIRED" "nghttp reneg verify" fi \ No newline at end of file Modified: httpd/test/mod_h2/trunk/test/test_trailer.sh URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_trailer.sh?rev=1715373&r1=1715372&r2=1715373&view=diff ============================================================================== --- httpd/test/mod_h2/trunk/test/test_trailer.sh (original) +++ httpd/test/mod_h2/trunk/test/test_trailer.sh Fri Nov 20 15:14:29 2015 @@ -24,7 +24,7 @@ echo "test trailers: $@" URL_PREFIX="$1" -if min_version 2.5.0; then +if min_version 2.4.18; then # basic test if we survive trailers via HTTP/2 at all # single nghttp_post_data echo.py $GEN/data-1k "1 trailer" \ @@ -55,5 +55,5 @@ EOF # TODO: we lack a test that shows the trailer is available # at the request *after* the content is read else - echo "trailer tests require httpd >= 2.5.0" + echo "trailer tests require httpd >= 2.4.18" fi \ No newline at end of file