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/03/28 11:22:02 UTC
svn commit: r1827913 - in /httpd/test/mod_h2/trunk: configure.ac
test/go/test_get.sh test/test_common.sh
Author: icing
Date: Wed Mar 28 11:22:02 2018
New Revision: 1827913
URL: http://svn.apache.org/viewvc?rev=1827913&view=rev
Log:
check for new tlsv1.3 when openssl supports it
Modified:
httpd/test/mod_h2/trunk/configure.ac
httpd/test/mod_h2/trunk/test/go/test_get.sh
httpd/test/mod_h2/trunk/test/test_common.sh
Modified: httpd/test/mod_h2/trunk/configure.ac
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/configure.ac?rev=1827913&r1=1827912&r2=1827913&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/configure.ac (original)
+++ httpd/test/mod_h2/trunk/configure.ac Wed Mar 28 11:22:02 2018
@@ -130,7 +130,7 @@ TEST_DEP=""
################################################################################
# curl
################################################################################
-CURL_VERSION=7.57.0
+CURL_VERSION=7.59.0
AC_PATH_PROG([CURL], [curl])
CURL=""
@@ -271,7 +271,8 @@ fi
# openssl
################################################################################
-OPENSSL_VERSION=1.0.2l
+#OPENSSL_VERSION=1.0.2l
+OPENSSL_VERSION=1.1.1-pre3
LIBEVENT_VERSION=2.0.22-stable
LIBEV_VERSION=4.24
ZLIB_VERSION=1.2.11
Modified: httpd/test/mod_h2/trunk/test/go/test_get.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/go/test_get.sh?rev=1827913&r1=1827912&r2=1827913&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/go/test_get.sh (original)
+++ httpd/test/mod_h2/trunk/test/go/test_get.sh Wed Mar 28 11:22:02 2018
@@ -51,6 +51,7 @@ echo "go GET on: $@"
# check cgi generated content
################################################################################
+
# force HTTP/1.1 connection
go_check_content hello.py "http/1.1" --http1.1 <<EOF
<html>
@@ -58,7 +59,7 @@ go_check_content hello.py "http/1.1" --h
<h2>Hello World!</h2>
HTTPS=${EXP_HTTPS}<br/>
PROTOCOL=${EXP_H1_PROTOCOL}<br/>
-SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
+SSL_PROTOCOL=${EXP_GO_SSL_PROTOCOL}<br/>
HTTP2=${EXP_H1_HTTP2}<br/>
H2PUSH=${EXP_H1_H2PUSH}<br/>
</body>
@@ -72,7 +73,7 @@ go_check_content hello.py "http2" <<EOF
<h2>Hello World!</h2>
HTTPS=${EXP_HTTPS}<br/>
PROTOCOL=${EXP_PROTOCOL}<br/>
-SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
+SSL_PROTOCOL=${EXP_GO_SSL_PROTOCOL}<br/>
HTTP2=${EXP_HTTP2}<br/>
H2PUSH=off<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=1827913&r1=1827912&r2=1827913&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_common.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_common.sh Wed Mar 28 11:22:02 2018
@@ -27,6 +27,7 @@ EXP_HTTPS=""
EXP_HTTP2=""
EXP_H2PUSH=""
+
AUTH="${URL_PREFIX#*://}"
HOST="${AUTH%%:*}"
URL_SCHEME="${URL_PREFIX%%:*}"
@@ -35,11 +36,6 @@ if [ "$URL_PATH" = "/$AUTH" ]; then
URL_PATH=""
fi
-if [ "$URL_SCHEME" = "https" ]; then
- EXP_SSL_PROTOCOL="TLSv1.2"
- EXP_HTTPS="on"
-fi
-
if test -z "$PREFIX" -a -f Makefile; then
p=$( grep '^prefix =' Makefile )
PREFIX=${p##*= }
@@ -62,6 +58,7 @@ CURL="${CURL:-${BIN_DIR}/curl} -sk --re
NGHTTP="${NGHTTP:-${BIN_DIR}/nghttp}"
H2LOAD="${H2LOAD:-${BIN_DIR}/h2load}"
APXS="${APXS:-${BIN_DIR}/apxs}"
+OPENSSL="${OPENSSL:-${BIN_DIR}/openssl}"
MH2FUZZ=mh2fuzz/mh2fuzz
@@ -71,6 +68,29 @@ CURL_VERSION=$( $CURL --version )
CURL_VERSION=${CURL_VERSION##curl }
CURL_VERSION=${CURL_VERSION%% *}
+OPENSSL_VERSION=$( $OPENSSL version )
+OPENSSL_VERSION=${OPENSSL_VERSION##OpenSSL }
+OPENSSL_VERSION=${OPENSSL_VERSION%% *}
+
+# so far, go gets its openssl linkage maybe from somewhere else
+
+EXP_GO_SSL_PROTOCOL="TLSv1.2"
+case $OPENSSL_VERSION in
+ 0.*|1.0*)
+ EXP_HTTPS_SSL_PROTOCOL="TLSv1.2"
+ ;;
+ *)
+ EXP_HTTPS_SSL_PROTOCOL="TLSv1.3"
+ ;;
+esac
+
+
+if [ "$URL_SCHEME" = "https" ]; then
+ EXP_SSL_PROTOCOL="${EXP_HTTPS_SSL_PROTOCOL}"
+ EXP_HTTPS="on"
+fi
+
+
min_version()
{
local version1="$1"
@@ -152,7 +172,7 @@ case "$URL_PREFIX" in
EXP_HTTPS="on"
EXP_PROTOCOL="${HTTP2_PROTOCOL}"
EXP_H1_PROTOCOL="${EXP_PROTOCOL}"
- EXP_SSL_PROTOCOL="TLSv1.2"
+ EXP_SSL_PROTOCOL="${EXP_HTTPS_SSL_PROTOCOL}"
;;
*/h2cproxy|*/h2cproxy-rewrite)
EXP_HTTPS=""