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

Fix issue processwire/processwire-issues#1506

Browse Source
This commit is contained in:
Ryan Cramer
2022-01-20 12:03:28 -05:00
parent 2818aecb96
commit 43c27b103a
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
wire/core/WireHttp.php
View File

@@ -22,14 +22,13 @@
* *
* Thanks to @horst for his assistance with several methods in this class. * Thanks to @horst for his assistance with several methods in this class.
* *
* ProcessWire 3.x, Copyright 2019 by Ryan Cramer * ProcessWire 3.x, Copyright 2022 by Ryan Cramer
* https://processwire.com * https://processwire.com
* *
* @method bool|string send($url, $data = array(), $method = 'POST', array $options = array()) * @method bool|string send($url, $data = array(), $method = 'POST', array $options = array())
* @method int sendFile($filename, array $options = array(), array $headers = array()) * @method int sendFile($filename, array $options = array(), array $headers = array())
* @method string download($fromURL, $toFile, array $options = array()) * @method string download($fromURL, $toFile, array $options = array())
* *
* @todo add proxy server support (3.0.150+)
* *
*/ */
@@ -51,7 +50,13 @@ class WireHttp extends Wire {
* #pw-internal * #pw-internal
* *
*/ */
const defaultDownloadTimeout = 50; const defaultDownloadTimeout = 50;
/**
* Default content-type header for POST requests
*
*/
const defaultPostContentType = 'application/x-www-form-urlencoded; charset=utf-8';
/** /**
* Default value for request $headers, when reset * Default value for request $headers, when reset
@@ -307,7 +312,7 @@ class WireHttp extends Wire {
* *
*/ */
public function post($url, $data = array(), array $options = array()) { public function post($url, $data = array(), array $options = array()) {
if(!isset($this->headers['content-type'])) $this->setHeader('content-type', 'application/x-www-form-urlencoded; charset=utf-8'); if(!isset($this->headers['content-type'])) $this->setHeader('content-type', self::defaultPostContentType);
return $this->send($url, $data, 'POST', $options); return $this->send($url, $data, 'POST', $options);
} }
@@ -652,6 +657,8 @@ class WireHttp extends Wire {
$this->lastSendType = 'curl'; $this->lastSendType = 'curl';
$timeout = isset($options['timeout']) ? (float) $options['timeout'] : $this->getTimeout(); $timeout = isset($options['timeout']) ? (float) $options['timeout'] : $this->getTimeout();
$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);
$contentType = isset($this->headers['content-type']) ? $this->headers['content-type'] : '';
$proxy = ''; $proxy = '';
if(!empty($options['proxy'])) { if(!empty($options['proxy'])) {
@@ -681,6 +688,10 @@ class WireHttp extends Wire {
} }
if(count($this->headers)) { if(count($this->headers)) {
if($isPost && !empty($this->data) && $contentType === self::defaultPostContentType) {
// CURL does not work w/default POST content-type when sending POST variables array
$this->headers['content-type'] = 'multipart/form-data; charset=utf-8';
}
$headers = array(); $headers = array();
foreach($this->headers as $name => $value) { foreach($this->headers as $name => $value) {
$headers[] = "$name: $value"; $headers[] = "$name: $value";
@@ -700,19 +711,19 @@ class WireHttp extends Wire {
// note: CURLOPT_PUT removed because it also requires CURLOPT_INFILE and CURLOPT_INFILESIZE. // note: CURLOPT_PUT removed because it also requires CURLOPT_INFILE and CURLOPT_INFILESIZE.
if($proxy) curl_setopt($curl, CURLOPT_PROXY, $proxy); if($proxy) curl_setopt($curl, CURLOPT_PROXY, $proxy);
if(!empty($this->data)) { if(!empty($this->data)) {
if(in_array($method, $postMethods)) { if($isPost) {
curl_setopt($curl, CURLOPT_POSTFIELDS, $this->data); curl_setopt($curl, CURLOPT_POSTFIELDS, $this->data);
} else { } else {
$content = http_build_query($this->data); $content = http_build_query($this->data);
if(strlen($content)) $url .= (strpos($url, '?') === false ? '?' : '&') . $content; if(strlen($content)) $url .= (strpos($url, '?') === false ? '?' : '&') . $content;
} }
} else if(!empty($this->rawData)) { } else if(!empty($this->rawData)) {
if(in_array($method, $postMethods)) { if($isPost) {
curl_setopt($curl, CURLOPT_POSTFIELDS, $this->rawData); curl_setopt($curl, CURLOPT_POSTFIELDS, $this->rawData);
} else { } else {
throw new WireException("Raw data option with CURL not supported for $method"); throw new WireException("Raw data option with CURL not supported for $method");
} }
} }