From 06c71eec659e4cce89a7623291e6e855fd0c0ce4 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 16 Dec 2018 22:38:58 +0000 Subject: default curl to http/1.1 (cherry picked from commit 04a45a407ead8e7afcdd3423b773074207e885df) --- include/network.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/network.php b/include/network.php index d37da05f7..a9a7cd03e 100644 --- a/include/network.php +++ b/include/network.php @@ -116,6 +116,14 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { @curl_setopt($ch, CURLOPT_USERPWD, $opts['http_auth']); } + if(array_key_exists('http_version',$opts)) { + @curl_setopt($ch,CURLOPT_HTTP_VERSION,$opts['http_version']); + } + else { + @curl_setopt($ch,CURLOPT_HTTP_VERSION,CURL_HTTP_VERSION_1_1); + } + + if(x($opts,'cookiejar')) @curl_setopt($ch, CURLOPT_COOKIEJAR, $opts['cookiejar']); if(x($opts,'cookiefile')) @@ -286,6 +294,13 @@ function z_post_url($url, $params, $redirects = 0, $opts = array()) { @curl_setopt($ch, CURLOPT_USERPWD, $opts['http_auth']); } + if(array_key_exists('http_version',$opts)) { + @curl_setopt($ch,CURLOPT_HTTP_VERSION,$opts['http_version']); + } + else { + @curl_setopt($ch,CURLOPT_HTTP_VERSION,CURL_HTTP_VERSION_1_1); + } + if(x($opts,'cookiejar')) @curl_setopt($ch, CURLOPT_COOKIEJAR, $opts['cookiejar']); if(x($opts,'cookiefile')) -- cgit v1.2.3