From a312e99a93bca8ce730fca604a1bd68bb83e1c3d Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Wed, 12 Jun 2019 23:48:12 +0800 Subject: [PATCH 1/2] build: change ASM compiler url to https --- configure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.py b/configure.py index 16ee259dc2bb10..a68360e43b23ac 100755 --- a/configure.py +++ b/configure.py @@ -692,7 +692,7 @@ def get_nasm_version(asm): stdout=subprocess.PIPE) except OSError: warn('''No acceptable ASM compiler found! - Please make sure you have installed NASM from http://www.nasm.us + Please make sure you have installed NASM from https://www.nasm.us and refer BUILDING.md.''') return '0' From 04a889461e3d1dd7d3e6e3865bcd977c748da2fa Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Wed, 12 Jun 2019 23:48:54 +0800 Subject: [PATCH 2/2] src: remove redundant return --- src/tls_wrap.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc index 17329c4b5ce56a..8c7d56e31b8a00 100644 --- a/src/tls_wrap.cc +++ b/src/tls_wrap.cc @@ -610,8 +610,6 @@ void TLSWrap::ClearIn() { // case because no further writes would succeed anyway. pending_cleartext_input_ = std::move(data); } - - return; }