mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-19 13:01:26 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#849

Browse Source
This commit is contained in:
Ryan Cramer
2019-04-16 05:59:55 -04:00
parent 144ce409b1
commit 3b8d92a975
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wire/core/WireHttp.php
View File

@@ -495,6 +495,7 @@ class WireHttp extends Wire {
$options = array_merge($defaults, $options); $options = array_merge($defaults, $options);
$url = $this->validateURL($url, false); $url = $this->validateURL($url, false);
$allowFopen = $this->hasFopen; $allowFopen = $this->hasFopen;
$allowCURL = $this->hasCURL && version_compare(PHP_VERSION, '5.5') >= 0; // #849
$result = false; $result = false;
if(empty($url)) return false; if(empty($url)) return false;
@@ -514,6 +515,9 @@ class WireHttp extends Wire {
if(!$this->hasCURL) { if(!$this->hasCURL) {
$this->error[] = 'CURL is not available'; $this->error[] = 'CURL is not available';
return false; return false;
} else if(!$allowCURL) {
$this->error[] = 'Using CURL requires PHP 5.6+';
return false;
} }
return $this->sendCURL($url, $method, $options); return $this->sendCURL($url, $method, $options);
@@ -530,7 +534,7 @@ class WireHttp extends Wire {
if($result === false && $options['fallback'] !== false) { if($result === false && $options['fallback'] !== false) {
// on fopen fail fallback to CURL then sockets // on fopen fail fallback to CURL then sockets
if($this->hasCURL && $options['fallback'] !== 'socket') { if($allowCURL && $options['fallback'] !== 'socket') {
$result = $this->sendCURL($url, $method, $options); $result = $this->sendCURL($url, $method, $options);
} }
if($result === false && $options['fallback'] !== 'curl') { if($result === false && $options['fallback'] !== 'curl') {