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 2018/10/19 12:16:50 UTC
svn commit: r1844333 - in /httpd/test/mod_h2/trunk: Makefile.am configure.ac
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 test/test_ssl.sh
Author: icing
Date: Fri Oct 19 12:16:49 2018
New Revision: 1844333
URL: http://svn.apache.org/viewvc?rev=1844333&view=rev
Log:
Adjusting SSL Version expectations, fixing invoking of configured curl binary
Modified:
httpd/test/mod_h2/trunk/Makefile.am
httpd/test/mod_h2/trunk/configure.ac
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
httpd/test/mod_h2/trunk/test/test_ssl.sh
Modified: httpd/test/mod_h2/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/Makefile.am?rev=1844333&r1=1844332&r2=1844333&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/Makefile.am (original)
+++ httpd/test/mod_h2/trunk/Makefile.am Fri Oct 19 12:16:49 2018
@@ -47,7 +47,7 @@ SUB_DIRS = clients
APACHECTL = @APACHECTL@ -d $(SERVER_DIR)
APXS = @APXS@
HTTPD = @HTTPD@
-CURL = $(prefix)/bin/curl
+CURL = @CURL@
NGHTTP = @NGHTTP@
H2LOAD = @H2LOAD@
Modified: httpd/test/mod_h2/trunk/configure.ac
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/configure.ac?rev=1844333&r1=1844332&r2=1844333&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/configure.ac (original)
+++ httpd/test/mod_h2/trunk/configure.ac Fri Oct 19 12:16:49 2018
@@ -397,6 +397,7 @@ AC_SUBST(SERVER_DIR)
AC_SUBST(NGHTTP2_DEPS)
AC_SUBST(OPENSSL_CONF_CMD)
AC_SUBST(OPENSSL_CONF)
+AC_SUBST(CURL)
AC_SUBST(CURL_CONF)
AC_SUBST(NGHTTP2_VERSION)
AC_SUBST(NGHTTP)
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=1844333&r1=1844332&r2=1844333&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 Oct 19 12:16:49 2018
@@ -10,7 +10,6 @@ print """\
<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 "HTTP2=" + os.getenv('HTTP2', '') + "<br/>"
print "H2PUSH=" + os.getenv('H2PUSH', '') + "<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=1844333&r1=1844332&r2=1844333&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_alt_host.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_alt_host.sh Fri Oct 19 12:16:49 2018
@@ -51,7 +51,6 @@ curl_check_content hello.py "serveralias
<h2>Hello World!</h2>
HTTPS=on<br/>
PROTOCOL=${HTTP2_PROTOCOL}<br/>
-SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
HTTP2=${EXP_HTTP2}<br/>
H2PUSH=${EXP_H2PUSH_CURL}<br/>
</body>
@@ -67,7 +66,6 @@ curl_check_content hello.py "test2 host"
<h2>Hello World!</h2>
HTTPS=on<br/>
PROTOCOL=${HTTP2_PROTOCOL}<br/>
-SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
HTTP2=${EXP_HTTP2}<br/>
H2PUSH=${EXP_H2PUSH_CURL}<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=1844333&r1=1844332&r2=1844333&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_common.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_common.sh Fri Oct 19 12:16:49 2018
@@ -53,11 +53,14 @@ GEN="gen"
TMP="$GEN/tmp"
APACHE_DIR="$GEN/apache"
-APACHECTL="${APACHECTL:-${BIN_DIR}/apachectl} -d $APACHE_DIR"
-CURL="${CURL:-${BIN_DIR}/curl} -sk --resolv ${HOST#*://}:127.0.0.1"
+APACHECTL="${APACHECTL:-${BIN_DIR}/apachectl} -d $APACHE_DIR"
+CURL_BIN="${CURL:-${BIN_DIR}/curl}"
+CURL="${CURL_BIN} -sk --resolv ${HOST#*://}:127.0.0.1"
+CURL_NOT_SILENT="${CURL_BIN} -k --resolv ${HOST#*://}:127.0.0.1"
NGHTTP="${NGHTTP:-${BIN_DIR}/nghttp}"
H2LOAD="${H2LOAD:-${BIN_DIR}/h2load}"
APXS="${APXS:-${BIN_DIR}/apxs}"
+
OPENSSL="${OPENSSL:-${BIN_DIR}/openssl}"
MH2FUZZ=mh2fuzz/mh2fuzz
@@ -69,8 +72,7 @@ CURL_VERSION=${CURL_VERSION##curl }
CURL_VERSION=${CURL_VERSION%% *}
OPENSSL_VERSION=$( $OPENSSL version )
-OPENSSL_VERSION=${OPENSSL_VERSION##OpenSSL }
-OPENSSL_VERSION=${OPENSSL_VERSION%% *}
+CURL_VERSIONS="$( $CURL -V )"
# so far, go gets its openssl linkage maybe from somewhere else
@@ -103,23 +105,6 @@ fail() {
exit 1
}
-EXP_GO_SSL_PROTOCOL="TLSv1.2"
-EXP_HTTPS_SSL_PROTOCOL="TLSv1.2"
-EXP_HTTPS_SSL_PROXY_PROTOCOL="TLSv1.2"
-
-if min_httpd_version 2.4.36; then
- # TLSv1.3 supported in "SSLProtocol all"
- case $OPENSSL_VERSION in
- 0.*|1.0*)
- ;;
- *)
- EXP_HTTPS_SSL_PROTOCOL="TLSv1.3"
- EXP_HTTPS_SSL_PROXY_PROTOCOL="TLSv1.3"
- ;;
- esac
-fi
-
-
if [ "$URL_SCHEME" = "https" ]; then
EXP_SSL_PROTOCOL="${EXP_HTTPS_SSL_PROTOCOL}"
EXP_HTTPS="on"
@@ -228,6 +213,19 @@ curl_check_doc() {
echo ok.
}
+curl_check_error() {
+ local DOC="$1"; shift;
+ local ERROR="$1"; shift;
+ local MSG="$1"; shift;
+ ARGS="$@"
+ echo -n " * curl /$DOC: $MSG..."
+ rm -rf $TMP
+ mkdir -p $TMP
+ ${CURL_NOT_SILENT} $URL_PREFIX/$DOC > $TMP/xxx 2>&1 && fail "curl did succeed"
+ fgrep ": $ERROR" $TMP/xxx >/dev/null || fail "expected $ERROR in output: $( cat $TMP/xxx )"
+ echo ok.
+}
+
curl_check_alpn() {
local PROTOCOL="$1"; shift;
local MSG="$1"; shift;
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=1844333&r1=1844332&r2=1844333&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_curl_get.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_curl_get.sh Fri Oct 19 12:16:49 2018
@@ -44,7 +44,6 @@ curl_check_content hello.py "http/1.1" -
<h2>Hello World!</h2>
HTTPS=${EXP_HTTPS}<br/>
PROTOCOL=${EXP_H1_PROTOCOL}<br/>
-SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
HTTP2=${EXP_H1_HTTP2}<br/>
H2PUSH=${EXP_H1_H2PUSH}<br/>
</body>
@@ -58,7 +57,6 @@ curl_check_content hello.py "http2" -
<h2>Hello World!</h2>
HTTPS=${EXP_HTTPS}<br/>
PROTOCOL=${EXP_PROTOCOL}<br/>
-SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
HTTP2=${EXP_HTTP2}<br/>
H2PUSH=${EXP_H2PUSH_CURL}<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=1844333&r1=1844332&r2=1844333&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_nghttp_get.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_nghttp_get.sh Fri Oct 19 12:16:49 2018
@@ -253,20 +253,3 @@ $URL_PATH/003.html 316 200
$URL_PATH/003/003_img.jpg 88K 200
EOF
-################################################################################
-# check cgi generated content
-################################################################################
-
-nghttp_check_content hello.py "get hello.py" <<EOF
-<html>
-<body>
-<h2>Hello World!</h2>
-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_ssl.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_ssl.sh?rev=1844333&r1=1844332&r2=1844333&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_ssl.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_ssl.sh Fri Oct 19 12:16:49 2018
@@ -41,7 +41,7 @@ URL_PREFIX="$URL1"
#
if min_httpd_version 2.4.18; then
if test $EXP_HTTPS_SSL_PROTOCOL = 'TLSv1.2'; then
- nghttp_check_rst_error ssl/renegotiate/cipher "HTTP_1_1_REQUIRED" "nghttp reneg cipher"
+ curl_check_error ssl/renegotiate/cipher "HTTP_1_1_REQUIRED" "nghttp reneg cipher"
fi
nghttp_check_rst_error ssl/renegotiate/verify "HTTP_1_1_REQUIRED" "nghttp reneg verify"