aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM. Dent <dentm42@gmail.com>2019-03-06 09:52:26 +0100
committerMario <mario@mariovavti.com>2019-03-06 09:52:26 +0100
commit0c05e6593e020180ca678dff6d60c095e23b34cd (patch)
tree9322b430e4e9b6c0212edc2e6e783c591a2a6bb8
parentc43ab50d6618724d8cf7ce4d691db5edca3ac8e0 (diff)
downloadvolse-hubzilla-0c05e6593e020180ca678dff6d60c095e23b34cd.tar.gz
volse-hubzilla-0c05e6593e020180ca678dff6d60c095e23b34cd.tar.bz2
volse-hubzilla-0c05e6593e020180ca678dff6d60c095e23b34cd.zip
Add CURLOPT_CONNECTTIMEOUT
-rw-r--r--include/network.php7
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"