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 2017/09/29 15:49:59 UTC
svn commit: r1810131 - in /httpd/test/mod_h2/trunk:
conf/sites/test2.example.org.conf configure.ac mh2fuzz/mh2f_version.h
Author: icing
Date: Fri Sep 29 15:49:59 2017
New Revision: 1810131
URL: http://svn.apache.org/viewvc?rev=1810131&view=rev
Log:
updated nghttp2 and curl versions
Modified:
httpd/test/mod_h2/trunk/conf/sites/test2.example.org.conf
httpd/test/mod_h2/trunk/configure.ac
httpd/test/mod_h2/trunk/mh2fuzz/mh2f_version.h
Modified: httpd/test/mod_h2/trunk/conf/sites/test2.example.org.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/sites/test2.example.org.conf?rev=1810131&r1=1810130&r2=1810131&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/sites/test2.example.org.conf (original)
+++ httpd/test/mod_h2/trunk/conf/sites/test2.example.org.conf Fri Sep 29 15:49:59 2017
@@ -16,7 +16,7 @@
KeepAliveTimeout 10
ProxyTimeout 10
- SSLEngine on
+ SSLEngine on
SSLCertificateFile conf/ssl/test.example.org.pem
SSLCertificateKeyFile conf/ssl/test.example.org.key
Modified: httpd/test/mod_h2/trunk/configure.ac
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/configure.ac?rev=1810131&r1=1810130&r2=1810131&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/configure.ac (original)
+++ httpd/test/mod_h2/trunk/configure.ac Fri Sep 29 15:49:59 2017
@@ -14,7 +14,7 @@
#
AC_PREREQ([2.67])
-AC_INIT([mod_h2_test], [1.8.0-DEV], [stefan.eissing@greenbytes.de])
+AC_INIT([mod_h2_test], [1.10.0-DEV], [stefan.eissing@greenbytes.de])
LT_PREREQ([2.2.6])
LT_INIT()
@@ -52,7 +52,7 @@ AC_ARG_WITH([serverdir], [AS_HELP_STRING
[Use serverdir directory for setup [default=gen/apache]])],
[request_serverdir=$withval], [request_serverdir=$PWD/gen/apache])
-NGHTTP2_VERSION=1.23.1
+NGHTTP2_VERSION=1.26.0
AC_ARG_WITH([nghttp2-version], [AS_HELP_STRING([--with-nghttp2-version],
[Use nghttp2 of specified version [default=<ignore>]])],
@@ -130,9 +130,10 @@ TEST_DEP=""
################################################################################
# curl
################################################################################
-CURL_VERSION=7.53.1
+CURL_VERSION=7.55.1
AC_PATH_PROG([CURL], [curl])
+CURL=""
if test "x${CURL}" != "x"; then
feats="$( ${CURL} -V | grep 'Features:.*HTTP2' )"
if test "x$feats" = "x"; then
@@ -149,10 +150,12 @@ if test -x "${prefix}/bin/curl"; then
fi
fi
-if test "x${CURL}" = "x"; then
+# force a local curl
+#if test "x${CURL}" = "x"; then
+if test "x" = "x"; then
CURL="${prefix}/bin/curl"
INSTALL_DEP="install-client"
- INSTALL_ADDITIONAL="curl($CURL_VERSION)"
+ INSTALL_ADDITIONAL="$INSTALL_ADDITIONAL curl($CURL_VERSION)"
else
CURL_VERSION="$( $CURL --version )"
CURL_VERSION="${CURL_VERSION#*curl }"
@@ -258,7 +261,7 @@ else
BUILD_SUBDIRS="nghttp2 $BUILD_SUBDIRS"
AC_MSG_NOTICE([no suitable nghttp2 found])
INSTALL_DEP="install-nghttp2 ${INSTALL_DEP}"
- INSTALL_ADDITIONAL="nghttp2($NGHTTP2_VERSION)"
+ INSTALL_ADDITIONAL="$INSTALL_ADDITIONAL nghttp2($NGHTTP2_VERSION)"
NGHTTP="${prefix}/bin/nghttp"
H2LOAD="${prefix}/bin/h2load"
fi
Modified: httpd/test/mod_h2/trunk/mh2fuzz/mh2f_version.h
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/mh2fuzz/mh2f_version.h?rev=1810131&r1=1810130&r2=1810131&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/mh2fuzz/mh2f_version.h (original)
+++ httpd/test/mod_h2/trunk/mh2fuzz/mh2f_version.h Fri Sep 29 15:49:59 2017
@@ -26,7 +26,7 @@
* @macro
* Version number of the http2 module as c string
*/
-#define MH2F_VERSION "1.8.0-DEV"
+#define MH2F_VERSION "1.10.0-DEV"
/**
* @macro
@@ -34,7 +34,7 @@
* release. This is a 24 bit number with 8 bits for major number, 8 bits
* for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
*/
-#define MH2F_VERSION_NUM 0x010800
+#define MH2F_VERSION_NUM 0x010a00
#endif /* mh2f_version_h */