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

Fix issue processwire/processwire-issues#1773

Browse Source
This commit is contained in:
Ryan Cramer
2023-06-30 10:10:48 -04:00
parent 834ddfba75
commit 91184cefb3
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wire/core/WireHttp.php
View File

@@ -730,9 +730,9 @@ class WireHttp extends Wire {
$this->resetResponse(); $this->resetResponse();
$this->lastSendType = 'curl'; $this->lastSendType = 'curl';
$timeout = isset($options['timeout']) ? (float) $options['timeout'] : $this->getTimeout(); $timeout = isset($options['timeout']) ? (float) $options['timeout'] : $this->getTimeout();
$timeoutMS = (int) ($timeout * 1000);
$postMethods = array('POST', 'PUT', 'DELETE', 'PATCH'); // methods for CURLOPT_POSTFIELDS $postMethods = array('POST', 'PUT', 'DELETE', 'PATCH'); // methods for CURLOPT_POSTFIELDS
$isPost = in_array($method, $postMethods); $isPost = in_array($method, $postMethods);
$proxy = '';
if(!empty($options['proxy'])) { if(!empty($options['proxy'])) {
$proxy = $options['proxy']; $proxy = $options['proxy'];
@@ -740,12 +740,14 @@ class WireHttp extends Wire {
$proxy = $options['curl']['http']['proxy']; $proxy = $options['curl']['http']['proxy'];
} else if(isset($options['http']) && !empty($options['http']['proxy'])) { } else if(isset($options['http']) && !empty($options['http']['proxy'])) {
$proxy = $options['http']['proxy']; $proxy = $options['http']['proxy'];
} else {
$proxy = '';
} }
$curl = curl_init(); $curl = curl_init();
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, $timeout); curl_setopt($curl, CURLOPT_TIMEOUT_MS, $timeoutMS);
curl_setopt($curl, CURLOPT_TIMEOUT, $timeout); curl_setopt($curl, CURLOPT_CONNECTTIMEOUT_MS, $timeoutMS);
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
curl_setopt($curl, CURLOPT_USERAGENT, $this->getUserAgent()); curl_setopt($curl, CURLOPT_USERAGENT, $this->getUserAgent());
@@ -1095,8 +1097,9 @@ class WireHttp extends Wire {
$curl = curl_init($fromURL); $curl = curl_init($fromURL);
if(isset($options['timeout'])) { if(isset($options['timeout'])) {
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, (int) $options['timeout']); $timeoutMS = (int) ($options['timeout'] * 1000);
curl_setopt($curl, CURLOPT_TIMEOUT, (int) $options['timeout']); curl_setopt($curl, CURLOPT_CONNECTTIMEOUT_MS, $timeoutMS);
curl_setopt($curl, CURLOPT_TIMEOUT_MS, $timeoutMS);
} }
curl_setopt($curl, CURLOPT_FILE, $fp); // write curl response to file curl_setopt($curl, CURLOPT_FILE, $fp); // write curl response to file
curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);