diff options
| author | Max Kostikov <max@kostikov.co> | 2018-12-20 20:51:26 +0100 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2018-12-20 20:51:26 +0100 |
| commit | 89e734dcca1525fa804343d6ecf5286ce70b05ba (patch) | |
| tree | 10d0a3614e9f97f5065ea53fff1c3d5fcd292c16 /include/network.php | |
| parent | 3a662555768840d18c6dbba027af644eda54f20e (diff) | |
| parent | 090fe394e4733aea9e9ca2e9a93c2c27b266d065 (diff) | |
| download | volse-hubzilla-89e734dcca1525fa804343d6ecf5286ce70b05ba.tar.gz volse-hubzilla-89e734dcca1525fa804343d6ecf5286ce70b05ba.tar.bz2 volse-hubzilla-89e734dcca1525fa804343d6ecf5286ce70b05ba.zip | |
Merge branch 'dev' into 'dev'
Sync dev
See merge request kostikov/core!1
Diffstat (limited to 'include/network.php')
| -rw-r--r-- | include/network.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/network.php b/include/network.php index e07001fa3..8ac71011e 100644 --- a/include/network.php +++ b/include/network.php @@ -120,6 +120,9 @@ 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']); + if(x($opts,'cookiejar')) @curl_setopt($ch, CURLOPT_COOKIEJAR, $opts['cookiejar']); if(x($opts,'cookiefile')) @@ -157,7 +160,7 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { // Pull out multiple headers, e.g. proxy and continuation headers // allow for HTTP/2.x without fixing code - while(preg_match('/^HTTP\/[1-3].+? [1-5][0-9][0-9]/',$base)) { + while(preg_match('/^HTTP\/[1-3](\.\d)? [1-5][0-9][0-9]/',$base)) { $chunk = substr($base,0,strpos($base,"\r\n\r\n")+4); $header .= $chunk; $base = substr($base,strlen($chunk)); @@ -290,6 +293,9 @@ 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']); + if(x($opts,'cookiejar')) @curl_setopt($ch, CURLOPT_COOKIEJAR, $opts['cookiejar']); if(x($opts,'cookiefile')) @@ -323,7 +329,7 @@ function z_post_url($url, $params, $redirects = 0, $opts = array()) { // Pull out multiple headers, e.g. proxy and continuation headers // allow for HTTP/2.x without fixing code - while(preg_match('/^HTTP\/[1-3].+? [1-5][0-9][0-9]/',$base)) { + while(preg_match('/^HTTP\/[1-3](\.\d)? [1-5][0-9][0-9]/',$base)) { $chunk = substr($base,0,strpos($base,"\r\n\r\n")+4); $header .= $chunk; $base = substr($base,strlen($chunk)); |