diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2016-06-26 12:55:05 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2016-06-26 12:55:05 +0200 |
| commit | 7a9d60d87eb8e4414e5fe05830b088d426ff810d (patch) | |
| tree | 0fc97a7eacfd071475afd8bc6d4372babacb5740 /apps/files_sharing/ajax | |
| parent | 5387b942c44e05b87ba2a0fd54168f5278a31344 (diff) | |
| parent | 52eab2a61a5d27b64fcd0440b91f854c052933a9 (diff) | |
| download | nextcloud-server-7a9d60d87eb8e4414e5fe05830b088d426ff810d.tar.gz nextcloud-server-7a9d60d87eb8e4414e5fe05830b088d426ff810d.zip | |
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
Diffstat (limited to 'apps/files_sharing/ajax')
| -rw-r--r-- | apps/files_sharing/ajax/external.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/files_sharing/ajax/external.php b/apps/files_sharing/ajax/external.php index 5cf86087f94..4a7a6096c91 100644 --- a/apps/files_sharing/ajax/external.php +++ b/apps/files_sharing/ajax/external.php @@ -77,7 +77,10 @@ $externalManager = new \OCA\Files_Sharing\External\Manager( // check for ssl cert if (substr($remote, 0, 5) === 'https') { try { - \OC::$server->getHTTPClientService()->newClient()->get($remote)->getBody(); + \OC::$server->getHTTPClientService()->newClient()->get($remote, [ + 'timeout' => 10, + 'connect_timeout' => 10, + ])->getBody(); } catch (\Exception $e) { \OCP\JSON::error(array('data' => array('message' => $l->t('Invalid or untrusted SSL certificate')))); exit; |