diff options
| author | M. Dent <dentm42@gmail.com> | 2019-03-06 08:52:26 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-03-06 09:56:01 +0100 |
| commit | a81286c795891a2e05297d2384a6fc8f81ee255e (patch) | |
| tree | 6168027bbbdc9f938addef388f0b9b6ffade31e1 | |
| parent | 571e9bf26aec8b12f7e2d1d7186d1f4810bbb914 (diff) | |
| download | volse-hubzilla-a81286c795891a2e05297d2384a6fc8f81ee255e.tar.gz volse-hubzilla-a81286c795891a2e05297d2384a6fc8f81ee255e.tar.bz2 volse-hubzilla-a81286c795891a2e05297d2384a6fc8f81ee255e.zip | |
Add CURLOPT_CONNECTTIMEOUT
(cherry picked from commit 0c05e6593e020180ca678dff6d60c095e23b34cd)
| -rw-r--r-- | include/network.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/network.php b/include/network.php index 8ac71011e..12f2ad4e9 100644 --- a/include/network.php +++ b/include/network.php @@ -114,6 +114,13 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { @curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60)); } + if(x($opts,'connecttimeout') && intval($opts['connecttimeout'])) { + @curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, intval($opts['connecttimeout'])); + } + else { + $curl_contime = intval(@get_config('system','curl_connecttimeout')); + @curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, (($curl_contime !== false) ? $curl_contime : 30)); + } if(x($opts,'http_auth')) { // "username" . ':' . "password" |