wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5358 from owncloud/postinstall-ocdavclientwithtimeout

Browse source 
Added timeout for WebDAV post setup check
This commit is contained in:
Vincent Petry 2013-10-18 01:10:04 -07:00
commit 11cfb9dc48
2 changed files with 49 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
lib/private/davclient.php Normal file
View file

@ -0,0 +1,46 @@
<?php
/**
* ownCloud
*
* @author Vincent Petry
* @copyright 2013 Vincent Petry <pvince81@owncloud.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either
* version 3 of the License, or any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
*
* You should have received a copy of the GNU Affero General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
/**
* This class extends the SabreDAV client with additional functionality
* like request timeout.
*/
class OC_DAVClient extends \Sabre_DAV_Client {
protected $requestTimeout;
/**
* @brief Sets the request timeout or 0 to disable timeout.
* @param int timeout in seconds or 0 to disable
*/
public function setRequestTimeout($timeout) {
$this->requestTimeout = (int)$timeout;
}
protected function curlRequest($url, $settings) {
if ($this->requestTimeout > 0) {
$settings[CURLOPT_TIMEOUT] = $this->requestTimeout;
}
return parent::curlRequest($url, $settings);
}
}

4
lib/private/util.php
View file

@ -806,7 +806,9 @@ class OC_Util {
'baseUri' => OC_Helper::linkToRemote('webdav'),
);
$client = new \Sabre_DAV_Client($settings);
$client = new \OC_DAVClient($settings);
$client->setRequestTimeout(10);
// for this self test we don't care if the ssl certificate is self signed and the peer cannot be verified.
$client->setVerifyPeer(false);