aboutsummaryrefslogtreecommitdiffstats
path: root/include/network.php
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2018-12-20 20:58:48 +0100
committerMax Kostikov <max@kostikov.co>2018-12-20 20:58:48 +0100
commite4958d5bb94af7880c7560e380f64de4d7f12b22 (patch)
treefbca29895e38a691922460c227a4a0bcfaf5f416 /include/network.php
parent090fe394e4733aea9e9ca2e9a93c2c27b266d065 (diff)
downloadvolse-hubzilla-e4958d5bb94af7880c7560e380f64de4d7f12b22.tar.gz
volse-hubzilla-e4958d5bb94af7880c7560e380f64de4d7f12b22.tar.bz2
volse-hubzilla-e4958d5bb94af7880c7560e380f64de4d7f12b22.zip
Revert "Fix cURL with HTTP/2"
This reverts commit 090fe394e4733aea9e9ca2e9a93c2c27b266d065
Diffstat (limited to 'include/network.php')
-rw-r--r--include/network.php17
1 files changed, 13 insertions, 4 deletions
diff --git a/include/network.php b/include/network.php
index 8ac71011e..65770221f 100644
--- a/include/network.php
+++ b/include/network.php
@@ -120,8 +120,13 @@ 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))
+ 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']);
@@ -160,7 +165,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](\.\d)? [1-5][0-9][0-9]/',$base)) {
+ while(preg_match('/^HTTP\/[1-3].+? [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));
@@ -293,8 +298,12 @@ 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))
+ 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']);
@@ -329,7 +338,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](\.\d)? [1-5][0-9][0-9]/',$base)) {
+ while(preg_match('/^HTTP\/[1-3].+? [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));