Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hard to solve issue 4 "Curl error code CURLE_URL_MALFORMAT" so we log the url

Browse source
This commit is contained in:
djmaze 2020-08-30 17:34:58 +02:00
parent 39ba67de4b
commit aea3389bf2
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
View file

@ -491,13 +491,13 @@ class PdoAddressBook
$aUrl = array(); $aUrl = array();
} }
$aUrl['scheme'] = isset($aUrl['scheme']) ? $aUrl['scheme'] : 'http'; $aUrl['scheme'] = $aUrl['scheme'] ?? 'http';
$aUrl['host'] = isset($aUrl['host']) ? $aUrl['host'] : 'localhost'; $aUrl['host'] = $aUrl['host'] ?? 'localhost';
$aUrl['port'] = isset($aUrl['port']) ? $aUrl['port'] : 80; $aUrl['port'] = $aUrl['port'] ?? 0;
$aUrl['path'] = isset($aUrl['path']) ? \rtrim($aUrl['path'], '\\/').'/' : '/'; $aUrl['path'] = isset($aUrl['path']) ? \rtrim($aUrl['path'], '\\/').'/' : '/';
$aSettings = array( $aSettings = array(
'baseUri' => $aUrl['scheme'].'://'.$aUrl['host'].('80' === (string) $aUrl['port'] ? '' : ':'.$aUrl['port']), 'baseUri' => $aUrl['scheme'].'://'.$aUrl['host'].($aUrl['port'] ? ':'.$aUrl['port'] : ''),
'userName' => $sUser, 'userName' => $sUser,
'password' => $sPassword 'password' => $sPassword
); );

2
rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Client.php
View file

@ -418,7 +418,7 @@ class Client {
); );
if ($curlErrNo) { if ($curlErrNo) {
throw new Exception('[CURL] Error while making request: ' . $curlError . ' (error code: ' . $curlErrNo . ')'); throw new Exception('[CURL] Error while making request: ' . $curlError . ' (error code: ' . $curlErrNo . ', uri: ' . $url . ')');
} }
if ($response['statusCode']>=400) { if ($response['statusCode']>=400) {