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/01/04 13:43:22 UTC
svn commit: r1777312 - in /httpd/test/mod_h2/trunk: configure.ac
mh2fuzz/mh2f_version.h nghttp2/Makefile.am test/test_debug.sh
Author: icing
Date: Wed Jan 4 13:43:21 2017
New Revision: 1777312
URL: http://svn.apache.org/viewvc?rev=1777312&view=rev
Log:
new releases of 3rd party libs, support of nghttp2 1.18.0 build with c-ares, normalized debug test reference output
Modified:
httpd/test/mod_h2/trunk/configure.ac
httpd/test/mod_h2/trunk/mh2fuzz/mh2f_version.h
httpd/test/mod_h2/trunk/nghttp2/Makefile.am
httpd/test/mod_h2/trunk/test/test_debug.sh
Modified: httpd/test/mod_h2/trunk/configure.ac
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/configure.ac?rev=1777312&r1=1777311&r2=1777312&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/configure.ac (original)
+++ httpd/test/mod_h2/trunk/configure.ac Wed Jan 4 13:43:21 2017
@@ -14,7 +14,7 @@
#
AC_PREREQ([2.67])
-AC_INIT([mod_h2_test], [1.4.5-DEV], [stefan.eissing@greenbytes.de])
+AC_INIT([mod_h2_test], [1.8.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.16.0
+NGHTTP2_VERSION=1.18.0
AC_ARG_WITH([nghttp2-version], [AS_HELP_STRING([--with-nghttp2-version],
[Use nghttp2 of specified version [default=<ignore>]])],
@@ -130,7 +130,7 @@ TEST_DEP=""
################################################################################
# curl
################################################################################
-CURL_VERSION=7.50.3
+CURL_VERSION=7.52.1
AC_PATH_PROG([CURL], [curl])
if test "x${CURL}" != "x"; then
@@ -270,7 +270,7 @@ fi
OPENSSL_VERSION=1.0.2j
LIBEVENT_VERSION=2.0.22-stable
LIBEV_VERSION=4.22
-ZLIB_VERSION=1.2.8
+ZLIB_VERSION=1.2.10
if test "x$ac_cv_nghttp2" != "xyes"; then
@@ -326,6 +326,19 @@ fi
INSTALL_ADDITIONAL="${INSTALL_ADDITIONAL# }"
################################################################################
+# c-ares
+################################################################################
+
+CARES_VERSION=1.12.0
+
+if test "x$ac_cv_nghttp2" != "xyes"; then
+
+ NGHTTP2_DEPS="$NGHTTP2_DEPS gen/.cares-installed"
+ INSTALL_ADDITIONAL="$INSTALL_ADDITIONAL libcares($CARES_VERSION)"
+fi
+
+INSTALL_ADDITIONAL="${INSTALL_ADDITIONAL# }"
+################################################################################
# php stuff
################################################################################
@@ -364,6 +377,7 @@ AC_SUBST(CURL_CONF)
AC_SUBST(NGHTTP2_VERSION)
AC_SUBST(NGHTTP)
AC_SUBST(H2LOAD)
+AC_SUBST(CARES_VERSION)
AC_SUBST(CURL_VERSION)
AC_SUBST(OPENSSL_VERSION)
AC_SUBST(LIBEV_VERSION)
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=1777312&r1=1777311&r2=1777312&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/mh2fuzz/mh2f_version.h (original)
+++ httpd/test/mod_h2/trunk/mh2fuzz/mh2f_version.h Wed Jan 4 13:43:21 2017
@@ -26,7 +26,7 @@
* @macro
* Version number of the http2 module as c string
*/
-#define MH2F_VERSION "1.4.5-DEV"
+#define MH2F_VERSION "1.8.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 0x010405
+#define MH2F_VERSION_NUM 0x010800
#endif /* mh2f_version_h */
Modified: httpd/test/mod_h2/trunk/nghttp2/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/nghttp2/Makefile.am?rev=1777312&r1=1777311&r2=1777312&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/nghttp2/Makefile.am (original)
+++ httpd/test/mod_h2/trunk/nghttp2/Makefile.am Wed Jan 4 13:43:21 2017
@@ -31,6 +31,11 @@ ZLIB_DIR = zlib-$(ZLIB_VERSION)
ZLIB_TAR = $(ZLIB_DIR).tar.gz
ZLIB_URL = http://zlib.net/$(ZLIB_TAR)
+CARES_VERSION = @CARES_VERSION@
+CARES_DIR = c-ares-$(CARES_VERSION)
+CARES_TAR = $(CARES_DIR).tar.gz
+CARES_URL = https://c-ares.haxx.se/download/$(CARES_TAR)
+
SPDYLAY_VERSION = @SPDYLAY_VERSION@
SPDYLAY_DIR = spdylay-$(SPDYLAY_VERSION)
SPDYLAY_TAR = $(SPDYLAY_DIR).tar.gz
@@ -309,3 +314,32 @@ $(GEN)/$(SPDYLAY_TAR):
@mkdir -p $(GEN)
curl $(CURL_OPTS) -L $(SPDYLAY_URL) > $(GEN)/$(SPDYLAY_TAR)
+################################################################################
+# Build + install a local c-ares library (if needed)
+#
+$(GEN)/.cares-installed: \
+ $(GEN)/$(CARES_DIR)/.cares-built
+ @echo -n installing c-ares locally...
+ @cd $(GEN)/$(CARES_DIR) && make install
+ @echo done.
+ @touch $(GEN)/.cares-installed
+
+$(GEN)/$(CARES_DIR)/.cares-built: \
+ $(GEN)/$(CARES_DIR)/.cares-configured
+ @echo -n building c-ares locally...
+ @cd $(GEN)/$(CARES_DIR) && make
+ @echo done.
+ @touch $(GEN)/$(CARES_DIR)/.cares-built
+
+$(GEN)/$(CARES_DIR)/.cares-configured: $(GEN)/$(CARES_TAR)
+ @rm -rf $(GEN)/$(CARES_DIR)
+ @cd $(GEN) && tar xfz $(CARES_TAR)
+ @echo -n configuring c-ares...
+ @cd $(GEN)/$(CARES_DIR) && ./configure --prefix=$(prefix)
+ @echo done.
+ @touch $(GEN)/$(CARES_DIR)/.cares-configured
+
+$(GEN)/$(CARES_TAR):
+ @mkdir -p $(GEN)
+ curl $(CURL_OPTS) -L $(CARES_URL) > $(GEN)/$(CARES_TAR)
+
Modified: httpd/test/mod_h2/trunk/test/test_debug.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_debug.sh?rev=1777312&r1=1777311&r2=1777312&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_debug.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_debug.sh Wed Jan 4 13:43:21 2017
@@ -30,6 +30,9 @@ curl_check_status() {
echo ok.
}
+# check the content we get from our debug handler, however skip the
+# fields depending on client settings. They vary, for example, per nghttp
+# version used
curl_check_debug() {
local DOC="$1"; shift;
local MSG="$1"; shift;
@@ -39,7 +42,8 @@ curl_check_debug() {
cat > $TMP/expected
echo -n " * curl /$DOC: $MSG..."
${CURL} $ARGS $URL_PREFIX/$DOC > $TMP/output 2>&1 || fail
- fgrep -v '"created":' < $TMP/output > $TMP/filtered
+ fgrep -v -e '"created":' -e SETTINGS_INITIAL_WINDOW_SIZE -e '"connFlowOut":' \
+ -e '"flowOut":' -e '"frames":' -e '"octets":' < $TMP/output > $TMP/filtered
diff -u $TMP/expected $TMP/filtered || fail
echo ok.
}
@@ -86,25 +90,21 @@ curl_check_debug .well-known/h2/state "c
"settings": {
"SETTINGS_MAX_CONCURRENT_STREAMS": 100,
"SETTINGS_MAX_FRAME_SIZE": 16384,
- "SETTINGS_INITIAL_WINDOW_SIZE": 65535,
"SETTINGS_ENABLE_PUSH": 1
},
"peerSettings": {
"SETTINGS_MAX_CONCURRENT_STREAMS": 100,
"SETTINGS_MAX_FRAME_SIZE": 16384,
- "SETTINGS_INITIAL_WINDOW_SIZE": 65535,
"SETTINGS_ENABLE_PUSH": 1,
"SETTINGS_HEADER_TABLE_SIZE": 4096,
"SETTINGS_MAX_HEADER_LIST_SIZE": -1
},
"connFlowIn": 2147483647,
- "connFlowOut": 65535,
"sentGoAway": 0,
"streams": {
"1": {
"state": "HALF_CLOSED_REMOTE",
"flowIn": 65535,
- "flowOut": 65535,
"dataIn": 0,
"dataOut": 0
}
@@ -113,13 +113,9 @@ curl_check_debug .well-known/h2/state "c
"in": {
"requests": 1,
"resets": 0,
- "frames": 3,
- "octets": 104
},
"out": {
"responses": 0,
- "frames": 3,
- "octets": 37
},
"push": {
"cacheDigest": "AQg",