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/03/17 13:06:14 UTC
svn commit: r1787357 - in /httpd/test/mod_h2/trunk: configure.ac
nghttp2/Makefile.am
Author: icing
Date: Fri Mar 17 13:06:14 2017
New Revision: 1787357
URL: http://svn.apache.org/viewvc?rev=1787357&view=rev
Log:
upping 3rd party versions
Modified:
httpd/test/mod_h2/trunk/configure.ac
httpd/test/mod_h2/trunk/nghttp2/Makefile.am
Modified: httpd/test/mod_h2/trunk/configure.ac
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/configure.ac?rev=1787357&r1=1787356&r2=1787357&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/configure.ac (original)
+++ httpd/test/mod_h2/trunk/configure.ac Fri Mar 17 13:06:14 2017
@@ -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.19.0
+NGHTTP2_VERSION=1.20.0
AC_ARG_WITH([nghttp2-version], [AS_HELP_STRING([--with-nghttp2-version],
[Use nghttp2 of specified version [default=<ignore>]])],
@@ -267,10 +267,10 @@ fi
# openssl
################################################################################
-OPENSSL_VERSION=1.0.2j
+OPENSSL_VERSION=1.1.0e
LIBEVENT_VERSION=2.0.22-stable
LIBEV_VERSION=4.22
-ZLIB_VERSION=1.2.10
+ZLIB_VERSION=1.2.11
if test "x$ac_cv_nghttp2" != "xyes"; then
@@ -282,7 +282,7 @@ if test "x$ac_cv_nghttp2" != "xyes"; the
fi
case "$OPENSSL_VERSION_PRESENT" in
- 1.0.2*)
+ 1.0.2*|1.1.*)
# acceptable
CURL_CONF='--with-nghttp2=$(prefix)'
;;
@@ -292,10 +292,10 @@ if test "x$ac_cv_nghttp2" != "xyes"; the
CURL_CONF='--with-nghttp2=$(prefix) --with-ssl=$(prefix)'
if test "$OS" = "Darwin"; then
OPENSSL_CONF_CMD="./Configure"
- OPENSSL_CONF="shared -fPIC darwin64-x86_64-cc"
+ OPENSSL_CONF="shared -fPIC darwin64-x86_64-cc enable-egd"
else
OPENSSL_CONF_CMD="./config"
- OPENSSL_CONF="shared -fPIC"
+ OPENSSL_CONF="shared -fPIC enable-egd"
NGHTTP2_DEPS="$NGHTTP2_DEPS gen/.libevent-installed"
INSTALL_ADDITIONAL="$INSTALL_ADDITIONAL libevent($LIBEVENT_VERSION)"
fi
Modified: httpd/test/mod_h2/trunk/nghttp2/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/nghttp2/Makefile.am?rev=1787357&r1=1787356&r2=1787357&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/nghttp2/Makefile.am (original)
+++ httpd/test/mod_h2/trunk/nghttp2/Makefile.am Fri Mar 17 13:06:14 2017
@@ -172,7 +172,7 @@ $(GEN)/$(OPENSSL_DIR)/.built: \
$(GEN)/$(OPENSSL_DIR)/.configured: \
$(GEN)/$(OPENSSL_DIR)/.patched
@echo -n configuring openssl...
- cd $(GEN)/$(OPENSSL_DIR) && $(OPENSSL_CONF_CMD) --openssldir=$(prefix) $(OPENSSL_CONF)
+ cd $(GEN)/$(OPENSSL_DIR) && $(OPENSSL_CONF_CMD) --prefix=$(prefix) --openssldir=$(prefix) $(OPENSSL_CONF)
@echo done.
@touch $(GEN)/$(OPENSSL_DIR)/.configured