bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #7248 from nupplaphil/bugs/6916-fatal-network

Browse source 
Fixing Network::post() caused by wrong argument
This commit is contained in:
Hypolite Petovan 2019-06-10 21:57:13 -04:00 committed by GitHub
parent 9491c63934 7c54edd4b4
commit 7761017915
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/dfrn_confirm.php
View file

@ -209,7 +209,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
* *
*/ */
$res = Network::post($dfrn_confirm, $params, null, 120)->getBody(); $res = Network::post($dfrn_confirm, $params, [], 120)->getBody();
Logger::log(' Confirm: received data: ' . $res, Logger::DATA); Logger::log(' Confirm: received data: ' . $res, Logger::DATA);

6
src/Util/Network.php
View file

@ -250,7 +250,7 @@ class Network
* @return CurlResult The content * @return CurlResult The content
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public static function post(string $url, $params, $headers = null, int $timeout = 0, int &$redirects = 0) public static function post(string $url, $params, array $headers = [], int $timeout = 0, int &$redirects = 0)
{ {
$stamp1 = microtime(true); $stamp1 = microtime(true);
@ -286,7 +286,7 @@ class Network
} }
if (defined('LIGHTTPD')) { if (defined('LIGHTTPD')) {
if (!is_array($headers)) { if (empty($headers)) {
$headers = ['Expect:']; $headers = ['Expect:'];
} else { } else {
if (!in_array('Expect:', $headers)) { if (!in_array('Expect:', $headers)) {
@ -295,7 +295,7 @@ class Network
} }
} }
if ($headers) { if (!empty($headers)) {
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
} }