[ARVADOS] created: 1.1.4-495-g116f934f0

[Git user]

        at  116f934f0359b27ae3bd3047860fc5e7f27bdcf5 (commit)


commit 116f934f0359b27ae3bd3047860fc5e7f27bdcf5
Author: Fuad Muhic <fmuhic at capeannenterprises.com>
Date:   Wed Jun 27 14:10:54 2018 +0200

    getConnection now works correctly when ARVADOS_API_HOST_INSECURE is set to TRUE
    
    Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic at capeannenterprises.com>

diff --git a/sdk/R/R/HttpRequest.R b/sdk/R/R/HttpRequest.R
index 95dd375de..abbe5b7b4 100644
--- a/sdk/R/R/HttpRequest.R
+++ b/sdk/R/R/HttpRequest.R
@@ -30,7 +30,7 @@ HttpRequest <- R6::R6Class(
 
             config <- httr::add_headers(unlist(headers))
             if(toString(Sys.getenv("ARVADOS_API_HOST_INSECURE") == "TRUE"))
-               config$options = list(ssl_verifypeer = FALSE)
+               config$options = list(ssl_verifypeer = 0L)
 
             # times = 1 regular call + numberOfRetries
             response <- httr::RETRY(verb, url = url, body = body,
diff --git a/sdk/R/R/RESTService.R b/sdk/R/R/RESTService.R
index ac65d0df3..7048b159c 100644
--- a/sdk/R/R/RESTService.R
+++ b/sdk/R/R/RESTService.R
@@ -195,6 +195,9 @@ RESTService <- R6::R6Class(
             h <- curl::new_handle()
             curl::handle_setheaders(h, .list = headers)
 
+            if(toString(Sys.getenv("ARVADOS_API_HOST_INSECURE") == "TRUE"))
+               curl::handle_setopt(h, ssl_verifypeer = 0L)
+
             conn <- curl::curl(url = fileURL, open = openMode, handle = h)
 
             conn

-----------------------------------------------------------------------


hooks/post-receive
--