httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1715219 - in /httpd/test/mod_h2/trunk: Makefile.am configure.ac test/test.sh test/test_common.sh test/test_nghttp_post.sh test/test_push.sh test/test_renegotiate.sh test/test_trailer.sh
Date Thu, 19 Nov 2015 17:16:09 GMT
Author: icing
Date: Thu Nov 19 17:16:09 2015
New Revision: 1715219

URL: http://svn.apache.org/viewvc?rev=1715219&view=rev
Log:
check httpd version for certain test cases

Added:
    httpd/test/mod_h2/trunk/test/test.sh
Modified:
    httpd/test/mod_h2/trunk/Makefile.am
    httpd/test/mod_h2/trunk/configure.ac
    httpd/test/mod_h2/trunk/test/test_common.sh
    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/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/Makefile.am?rev=1715219&r1=1715218&r2=1715219&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/Makefile.am (original)
+++ httpd/test/mod_h2/trunk/Makefile.am Thu Nov 19 17:16:09 2015
@@ -45,6 +45,7 @@ SERVER_DIR     = @SERVER_DIR@
 SUB_DIRS       = clients
 
 APACHECTL      = @APACHECTL@ -d $(SERVER_DIR)
+APXS           = @APXS@
 HTTPD          = @HTTPD@
 CURL           = $(prefix)/bin/curl
 NGHTTP         = @NGHTTP@
@@ -107,91 +108,15 @@ install: @INSTALL_DEP@
 # Test the local httpd
 #
 
-TESTRUN = PREFIX=$(prefix) NGHTTP=$(NGHTTP) CURL=$(CURL) bash
+TESTRUN = PREFIX=$(prefix) NGHTTP=$(NGHTTP) CURL=$(CURL) APXS=$(APXS) bash
 
 test: \
 		$(SERVER_DIR)/.test-setup \
 		$(SERVER_DIR)/.curl-installed
 	@rm -rf $(GEN)/tmp
 	@mkdir -p $(GEN)/tmp
-	@$(TESTRUN) test/test_curl_altsvc.sh http://$(HTTP_AUTH) https://$(HTTPS_AUTH)
-	@$(TESTRUN) test/test_proto_order.sh https://$(HTTPS_AUTH) https://$(HTTPS_AUTH_2)
-	@$(TESTRUN) test/test_alt_host.sh    https://$(HTTPS_AUTH) https://$(HTTPS_AUTH_2)
-	@$(TESTRUN) test/test_renegotiate.sh https://$(HTTPS_AUTH)
-	@$(TESTRUN) test/test_upgrade.sh     http://$(HTTP_AUTH) https://$(HTTPS_AUTH)
-	@$(TESTRUN) test/test_nghttp_get.sh  https://$(HTTPS_AUTH)
-	@$(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_push.sh        https://$(HTTPS_AUTH)
-	@$(TESTRUN) test/test_trailer.sh     https://$(HTTPS_AUTH)
-	@$(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_push.sh        http://$(HTTP_AUTH)
-	@$(TESTRUN) test/test_trailer.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 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"
-	@$(TESTRUN) test/test_trailer.sh     https://$(HTTPS_AUTH_SER)
+	$(TESTRUN) test/test.sh test $(HTTP_PORT) $(HTTPS_PORT) $(HOST_NAME) $(HOST_NAME_2) $(HOST_SER_NAME)
 
-test2.4: \
-		$(SERVER_DIR)/.test-setup \
-		$(SERVER_DIR)/.curl-installed
-	@rm -rf $(GEN)/tmp
-	@mkdir -p $(GEN)/tmp
-	@$(TESTRUN) test/test_curl_altsvc.sh http://$(HTTP_AUTH) https://$(HTTPS_AUTH)
-	@$(TESTRUN) test/test_proto_order.sh https://$(HTTPS_AUTH) https://$(HTTPS_AUTH_2)
-	@$(TESTRUN) test/test_nghttp_get.sh  https://$(HTTPS_AUTH)
-	@$(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 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 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/configure.ac
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/configure.ac?rev=1715219&r1=1715218&r2=1715219&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/configure.ac (original)
+++ httpd/test/mod_h2/trunk/configure.ac Thu Nov 19 17:16:09 2015
@@ -334,6 +334,7 @@ AC_SUBST(LIBEXEC_DIR)
 AC_SUBST(SERVER_NAME)
 AC_SUBST(ABS_PWD)
 AC_SUBST(PHPCGI)
+AC_SUBST(APXS)
 AC_SUBST(APACHECTL)
 AC_SUBST(HTTPD)
 AC_SUBST(MODULES)

Added: httpd/test/mod_h2/trunk/test/test.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test.sh?rev=1715219&view=auto
==============================================================================
--- httpd/test/mod_h2/trunk/test/test.sh (added)
+++ httpd/test/mod_h2/trunk/test/test.sh Thu Nov 19 17:16:09 2015
@@ -0,0 +1,77 @@
+#!/bin/bash
+# Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+################################################################################
+# check announcements of upgrade: possibilities
+################################################################################
+
+
+TEST_DIR="$1"; shift
+HTTP_PORT="$1"; shift
+HTTPS_PORT="$1"; shift
+HOST_NAME="$1"; shift
+HOST_NAME_2="$1"; shift
+HOST_NAME_SER="$1"; shift
+
+HTTP_AUTH=http://$HOST_NAME:$HTTP_PORT
+HTTPS_AUTH=https://$HOST_NAME:$HTTPS_PORT
+HTTPS_AUTH_2=https://$HOST_NAME_2:$HTTPS_PORT
+HTTPS_AUTH_SER=https://$HOST_NAME_SER:$HTTPS_PORT
+
+echo "curl is $CURL"
+
+export CURL="$CURL"
+
+$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              &&
+$SHELL "$TEST_DIR"/test_renegotiate.sh $HTTPS_AUTH                            &&
+$SHELL "$TEST_DIR"/test_upgrade.sh     $HTTP_AUTH  $HTTPS_AUTH                &&
+$SHELL "$TEST_DIR"/test_nghttp_get.sh  $HTTPS_AUTH                            &&
+$SHELL "$TEST_DIR"/test_nghttp_post.sh $HTTPS_AUTH                            &&
+$SHELL "$TEST_DIR"/test_curl_get.sh    $HTTPS_AUTH                            &&
+$SHELL "$TEST_DIR"/test_curl_post.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"      &&
+$SHELL "$TEST_DIR"/test_curl_get.sh    $HTTPS_AUTH/proxy alpn "HTTP/1.1"      &&
+$SHELL "$TEST_DIR"/test_curl_post.sh   $HTTPS_AUTH/proxy alpn "HTTP/1.1"      &&
+$SHELL "$TEST_DIR"/test_nghttp_get.sh  $HTTPS_AUTH/rewrite alpn "HTTP/1.1"    &&
+$SHELL "$TEST_DIR"/test_nghttp_post.sh $HTTPS_AUTH/rewrite alpn "HTTP/1.1"    &&
+$SHELL "$TEST_DIR"/test_curl_get.sh    $HTTPS_AUTH/rewrite alpn "HTTP/1.1"    &&
+$SHELL "$TEST_DIR"/test_curl_post.sh   $HTTPS_AUTH/rewrite alpn "HTTP/1.1"    &&
+$SHELL "$TEST_DIR"/test_nghttp_get.sh  $HTTP_AUTH                             &&
+$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                      &&
+$SHELL "$TEST_DIR"/test_nghttp_get.sh  $HTTP_AUTH/proxy alpn "HTTP/1.1"       &&
+$SHELL "$TEST_DIR"/test_nghttp_post.sh $HTTP_AUTH/proxy alpn "HTTP/1.1"       &&
+$SHELL "$TEST_DIR"/test_curl_get.sh    $HTTP_AUTH/proxy alpn "HTTP/1.1"       &&
+$SHELL "$TEST_DIR"/test_curl_post.sh   $HTTP_AUTH/proxy alpn "HTTP/1.1"       &&
+$SHELL "$TEST_DIR"/test_nghttp_get.sh  $HTTP_AUTH/rewrite alpn "HTTP/1.1"     &&
+$SHELL "$TEST_DIR"/test_nghttp_post.sh $HTTP_AUTH/rewrite alpn "HTTP/1.1"     &&
+$SHELL "$TEST_DIR"/test_curl_get.sh    $HTTP_AUTH/rewrite alpn "HTTP/1.1"     &&
+$SHELL "$TEST_DIR"/test_curl_post.sh   $HTTP_AUTH/rewrite alpn "HTTP/1.1"     &&
+$SHELL "$TEST_DIR"/test_nghttp_get.sh  $HTTPS_AUTH_SER alpn "HTTP/1.1"        &&
+$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

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=1715219&r1=1715218&r2=1715219&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_common.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_common.sh Thu Nov 19 17:16:09 2015
@@ -47,8 +47,21 @@ TMP="$GEN/tmp"
 
 CURL="${CURL:-${BIN_DIR}/curl}  -sk --resolv ${HOST#*://}:127.0.0.1"
 NGHTTP="${NGHTTP:-${BIN_DIR}/nghttp}"
+APXS="${APXS:-${BIN_DIR}/apxs}"
 
 
+HTTPD_VERSION="$($APXS -q HTTPD_VERSION)"
+
+# return 0 if HTTPD_VERSION is equal or greater than given version
+min_version()
+{
+    local version="$1"
+    
+    local winner=$(echo -e "$HTTPD_VERSION\n$version" | sort -t. -k1,1n -k2,2n -k3,3n | head
-1)
+    test "$winner" = "$version" && return 0
+    return 1
+}
+
 fail() {
     echo "$@"
     exit 1

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=1715219&r1=1715218&r2=1715219&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_nghttp_post.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_nghttp_post.sh Thu Nov 19 17:16:09 2015
@@ -72,6 +72,7 @@ nghttp_post_file upload.py $GEN/data-1m
 
 
 # Tests without content-length *and* without content-type announced
-nghttp_post_data echo.py $GEN/data-1k "1k upload w/o c-len+c-type" --no-content-length
-
+if min_version 2.5.0; 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=1715219&r1=1715218&r2=1715219&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_push.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_push.sh Thu Nov 19 17:16:09 2015
@@ -24,25 +24,29 @@ echo "test server push"
 
 URL_PREFIX="$1"
 
-# 2 link headers
-nghttp_check_fcontent 006-push.html "get 006-push"   <<EOF
+if min_version 2.5.0; then
+    # 2 link headers
+    nghttp_check_fcontent 006-push.html "get 006-push"   <<EOF
 006-push.html
 006/006.css
 EOF
 
-# 1 link header with 2 links, separated by ,
-nghttp_check_fcontent 006-push2.html "get 006-push2"   <<EOF
+    # 1 link header with 2 links, separated by ,
+    nghttp_check_fcontent 006-push2.html "get 006-push2"   <<EOF
 006-push2.html
 006/006.js
 EOF
 
-# 1 link header, 1 link preload, 1 link with other relation
-nghttp_check_fcontent 006-push3.html "get 006-push3"   <<EOF
+    # 1 link header, 1 link preload, 1 link with other relation
+    nghttp_check_fcontent 006-push3.html "get 006-push3"   <<EOF
 006-push3.html
 006/006.js
 EOF
 
-# 1 link header with missing '>' link termination
-nghttp_check_fcontent 006-push4.html "get 006-push4"   <<EOF
+    # 1 link header with missing '>' link termination
+    nghttp_check_fcontent 006-push4.html "get 006-push4"   <<EOF
 006-push4.html
 EOF
+else
+    echo "push tests require httpd >= 2.5.0"
+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=1715219&r1=1715218&r2=1715219&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_renegotiate.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_renegotiate.sh Thu Nov 19 17:16:09 2015
@@ -37,6 +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
 #
-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"
-
+if min_version 2.5.0; 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=1715219&r1=1715218&r2=1715219&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_trailer.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_trailer.sh Thu Nov 19 17:16:09 2015
@@ -24,11 +24,15 @@ echo "test trailers"
 
 URL_PREFIX="$1"
 
-nghttp_post_data echo.py $GEN/data-1k "1 trailer" \
-    --trailer "test: 1"
+if min_version 2.5.0; then
+    nghttp_post_data echo.py $GEN/data-1k "1 trailer" \
+        --trailer "test: 1"
 
-nghttp_post_data echo.py $GEN/data-1k "2 trailers" \
-    --trailer "test: 2" --trailer "XXX: test"
+    nghttp_post_data echo.py $GEN/data-1k "2 trailers" \
+        --trailer "test: 2" --trailer "XXX: test"
 
-nghttp_post_data echo.py $GEN/data-1k "1 trailer w/o c-len" \
-    --trailer "test: 3" --no-content-length 
+    nghttp_post_data echo.py $GEN/data-1k "1 trailer w/o c-len" \
+        --trailer "test: 3" --no-content-length 
+else
+    echo "trailer tests require httpd >= 2.5.0"
+fi
\ No newline at end of file



Mime
View raw message