Merge pull request #545 from nextcloud/bugfix/noid/self-signed-cert

some fixs
pull/547/head
Maxence Lange 2019-05-27 09:24:35 -01:00 zatwierdzone przez GitHub
commit 0c8dce5c61
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 11 dodań i 2 usunięć

Wyświetl plik

@ -107,6 +107,7 @@ class Queue extends TimedJob {
private function manageStreamQueue() {
$total = 0;
$items = $this->streamQueueService->getRequestStandby($total);
foreach ($items as $item) {

Wyświetl plik

@ -115,7 +115,14 @@ class CurlService {
$request->addData('resource', 'acct:' . $account);
$request->setAddress($host);
$result = $this->request($request);
try {
$result = $this->request($request);
} catch (RequestNetworkException $e) {
if ($e->getCode() === CURLE_COULDNT_CONNECT) {
$request->setProtocol('http');
$result = $this->request($request);
} else throw $e;
}
return $result;
}
@ -296,6 +303,7 @@ class CurlService {
curl_setopt($curl, CURLOPT_BINARYTRANSFER, $request->isBinary());
curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
$this->maxDownloadSize =
@ -418,7 +426,7 @@ class CurlService {
throw new RequestNetworkException(
$errno . ' - ' . curl_error($curl) . ' - ' . json_encode(
$request, JSON_UNESCAPED_SLASHES
)
), $errno
);
}
}