diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-30 10:42:05 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-30 10:42:05 +0200 |
| commit | 629faf6d343e7906322d125718f97d3ac2f9569b (patch) | |
| tree | 199d65b12eb3b09931de62d0302f9715ae294a41 /lib/util.php | |
| parent | 5462e199d391a1e4c9858bfd8444366a1047fa7f (diff) | |
| parent | 5899485ca17045e93528c29d1ed63b02192c4191 (diff) | |
| download | nextcloud-server-629faf6d343e7906322d125718f97d3ac2f9569b.tar.gz nextcloud-server-629faf6d343e7906322d125718f97d3ac2f9569b.zip | |
Merge branch 'master' into appframework-master
Diffstat (limited to 'lib/util.php')
| -rwxr-xr-x | lib/util.php | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/util.php b/lib/util.php index 41f5f1d16be..d4f4eed1ca7 100755 --- a/lib/util.php +++ b/lib/util.php @@ -730,12 +730,6 @@ class OC_Util { 'baseUri' => OC_Helper::linkToRemote('webdav'), ); - // save the old timeout so that we can restore it later - $oldTimeout = ini_get("default_socket_timeout"); - - // use a 5 sec timeout for the check. Should be enough for local requests. - ini_set("default_socket_timeout", 5); - $client = new \Sabre_DAV_Client($settings); // for this self test we don't care if the ssl certificate is self signed and the peer cannot be verified. @@ -752,9 +746,6 @@ class OC_Util { $return = false; } - // restore the original timeout - ini_set("default_socket_timeout", $oldTimeout); - return $return; } |