mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-18 12:31:17 +02:00
Code Issues Releases Wiki Activity

Additional update for processwire/processwire-issues#849

Browse Source
This commit is contained in:
Ryan Cramer
2019-04-16 06:08:52 -04:00
parent 3b8d92a975
commit f0c79f38cf
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wire/core/WireHttp.php
View File

@@ -516,10 +516,11 @@ class WireHttp extends Wire {
$this->error[] = 'CURL is not available'; $this->error[] = 'CURL is not available';
return false; return false;
} else if(!$allowCURL) { } else if(!$allowCURL) {
$this->error[] = 'Using CURL requires PHP 5.6+'; $this->error[] = 'Using CURL requires PHP 5.5+';
return false; return false;
} } else {
return $this->sendCURL($url, $method, $options); return $this->sendCURL($url, $method, $options);
}
} else if($options['use'] === 'fopen' && !$allowFopen) { } else if($options['use'] === 'fopen' && !$allowFopen) {
$this->error[] = 'fopen is not available'; $this->error[] = 'fopen is not available';
@@ -638,9 +639,17 @@ class WireHttp extends Wire {
curl_setopt($curl, CURLOPT_TIMEOUT, $timeout); curl_setopt($curl, CURLOPT_TIMEOUT, $timeout);
curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
curl_setopt($curl, CURLOPT_SAFE_UPLOAD, true);
curl_setopt($curl, CURLOPT_USERAGENT, $this->getUserAgent()); curl_setopt($curl, CURLOPT_USERAGENT, $this->getUserAgent());
if(version_compare(PHP_VERSION, '5.6') >= 0) {
// CURLOPT_SAFE_UPLOAD value is default true (setopt not necessary)
// and PHP 7+ removes this option
} else if(version_compare(PHP_VERSION, '5.5') >= 0) {
curl_setopt($curl, CURLOPT_SAFE_UPLOAD, true);
} else {
// not reachable: version blocked before sendCURL call
}
if(count($this->headers)) { if(count($this->headers)) {
curl_setopt($curl, CURLOPT_HTTPHEADER, $this->headers); curl_setopt($curl, CURLOPT_HTTPHEADER, $this->headers);
} }