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 2015/10/07 15:28:18 UTC
svn commit: r1707298 - in /httpd/test/mod_h2/trunk: configure.ac
nghttp2/Makefile.am
Author: icing
Date: Wed Oct 7 13:28:18 2015
New Revision: 1707298
URL: http://svn.apache.org/viewvc?rev=1707298&view=rev
Log:
updated curl version, disabled cert check on github download due to amazon root missing
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=1707298&r1=1707297&r2=1707298&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/configure.ac (original)
+++ httpd/test/mod_h2/trunk/configure.ac Wed Oct 7 13:28:18 2015
@@ -128,7 +128,7 @@ TEST_DEP=""
################################################################################
# curl
################################################################################
-CURL_VERSION=7.44.0
+CURL_VERSION=7.45.0
AC_PATH_PROG([CURL], [curl])
if test "x${CURL}" != "x"; then
Modified: httpd/test/mod_h2/trunk/nghttp2/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/nghttp2/Makefile.am?rev=1707298&r1=1707297&r2=1707298&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/nghttp2/Makefile.am (original)
+++ httpd/test/mod_h2/trunk/nghttp2/Makefile.am Wed Oct 7 13:28:18 2015
@@ -129,9 +129,11 @@ $(GEN)/$(NGHTTP2_DIR)/.nghttp2-extracted
################################################################################
# Retrieve nghttp2 sources
#
+# -k as the s3.amazonws certs have an unknown root (2015-10-07)
+#
$(GEN)/$(NGHTTP2_TAR):
@mkdir -p $(GEN)
- curl $(CURL_OPTS) -L $(NGHTTP2_URL) > $(GEN)/$(NGHTTP2_TAR)
+ curl $(CURL_OPTS) -k -L $(NGHTTP2_URL) > $(GEN)/$(NGHTTP2_TAR) || rm -f $(GEN)/$(NGHTTP2_TAR)
################################################################################
@@ -168,7 +170,7 @@ $(GEN)/$(OPENSSL_DIR)/.patched: \
$(GEN)/$(OPENSSL_DIR)/.extracted:
@echo -n downloading and extracting openssl...
@mkdir -p $(GEN)
- curl $(CURL_OPTS) -L $(OPENSSL_URL) > $(GEN)/$(OPENSSL_TAR)
+ curl $(CURL_OPTS) -L $(OPENSSL_URL) > $(GEN)/$(OPENSSL_TAR) || rm -f $(GEN)/$(OPENSSL_TAR)
@cd gen; tar xfz $(OPENSSL_TAR)
@echo done.
@touch $(GEN)/$(OPENSSL_DIR)/.extracted