cURL does not honour default_socket_timeout

SabreDAV uses cURL for the requests and as this does not honour
default_socket_timeout, setting it is useless and confusing as
people will expect the request to timeout faster than it actually
will do.

One has to use
 curl_setopt($curl, CURLOPT_TIMEOUT, x)
or
 curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, x)
but there is currently no way to make SabreDAV pass this to cURL.

diff --git a/lib/util.php b/lib/util.php
index 41f5f1d16be3164c29e0a293a9ae8af2a67677d5..d4f4eed1ca77c6398d9f0170ac8397e7e3727934 100755 (executable)
--- 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;
        }