You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by ad...@apache.org on 2018/05/17 03:22:51 UTC
kudu git commit: KUDU-2427: update to latest version of curl
Repository: kudu
Updated Branches:
refs/heads/master da9f97e7f -> f57d73321
KUDU-2427: update to latest version of curl
The existing version of curl doesn't work with OpenSSL 1.1, which is what
ships by default with Ubuntu 18.04.
Without the change to curl_util.cc, SslWebserverTest_TestSSL fails with:
curl error: SSL peer certificate or SSH remote key was not OK
Change-Id: I804d01a5ed702501223dd4099100153cca412b49
Reviewed-on: http://gerrit.cloudera.org:8080/10432
Tested-by: Kudu Jenkins
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/f57d7332
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/f57d7332
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/f57d7332
Branch: refs/heads/master
Commit: f57d73321897850acdbf0fbfaafc7ba3a8605a72
Parents: da9f97e
Author: Adar Dembo <ad...@cloudera.com>
Authored: Fri May 11 17:25:26 2018 -0700
Committer: Adar Dembo <ad...@cloudera.com>
Committed: Thu May 17 03:22:19 2018 +0000
----------------------------------------------------------------------
src/kudu/util/curl_util.cc | 9 ++++++---
thirdparty/download-thirdparty.sh | 3 ++-
thirdparty/vars.sh | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/f57d7332/src/kudu/util/curl_util.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/curl_util.cc b/src/kudu/util/curl_util.cc
index b93d723..d2aa75b 100644
--- a/src/kudu/util/curl_util.cc
+++ b/src/kudu/util/curl_util.cc
@@ -78,9 +78,12 @@ Status EasyCurl::DoRequest(const std::string& url,
faststring* dst) {
CHECK_NOTNULL(dst)->clear();
- RETURN_NOT_OK(TranslateError(curl_easy_setopt(
- curl_, CURLOPT_SSL_VERIFYPEER,
- static_cast<long>(verify_peer_)))); // NOLINT
+ if (!verify_peer_) {
+ RETURN_NOT_OK(TranslateError(curl_easy_setopt(
+ curl_, CURLOPT_SSL_VERIFYHOST, 0)));
+ RETURN_NOT_OK(TranslateError(curl_easy_setopt(
+ curl_, CURLOPT_SSL_VERIFYPEER, 0)));
+ }
RETURN_NOT_OK(TranslateError(curl_easy_setopt(curl_, CURLOPT_URL, url.c_str())));
if (return_headers_) {
RETURN_NOT_OK(TranslateError(curl_easy_setopt(curl_, CURLOPT_HEADER, 1)));
http://git-wip-us.apache.org/repos/asf/kudu/blob/f57d7332/thirdparty/download-thirdparty.sh
----------------------------------------------------------------------
diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh
index 758a189..5ee0ba5 100755
--- a/thirdparty/download-thirdparty.sh
+++ b/thirdparty/download-thirdparty.sh
@@ -261,7 +261,8 @@ CURL_PATCHLEVEL=0
fetch_and_patch \
curl-${CURL_VERSION}.tar.gz \
$CURL_SOURCE \
- $CURL_PATCHLEVEL
+ $CURL_PATCHLEVEL \
+ "autoreconf -fvi"
CRCUTIL_PATCHLEVEL=1
fetch_and_patch \
http://git-wip-us.apache.org/repos/asf/kudu/blob/f57d7332/thirdparty/vars.sh
----------------------------------------------------------------------
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index b126046..e89342e 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -119,7 +119,7 @@ GCOVR_VERSION=3.0
GCOVR_NAME=gcovr-$GCOVR_VERSION
GCOVR_SOURCE=$TP_SOURCE_DIR/$GCOVR_NAME
-CURL_VERSION=7.32.0
+CURL_VERSION=7.59.0
CURL_NAME=curl-$CURL_VERSION
CURL_SOURCE=$TP_SOURCE_DIR/$CURL_NAME