diff options
| author | Barak Korren <[email protected]> | 2013-04-01 16:05:48 +0300 |
|---|---|---|
| committer | Barak Korren <[email protected]> | 2013-04-01 16:05:48 +0300 |
| commit | 32b7a340adb9c1acd209049512c0b5d53ed04276 (patch) | |
| tree | ee606f7c734a0f6403d2fd0dda9d0a8ee6c6b8a9 /include/functions.php | |
| parent | 83dff597ce2c4fa0c303b83c369392c4eb19bafa (diff) | |
| parent | 8401101d5051c4ccad140fc4b062fa9c780d06d9 (diff) | |
Merge branch 'master' into tunable-fetches
Conflicts:
include/rssfuncs.php
Diffstat (limited to 'include/functions.php')
| -rw-r--r-- | include/functions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/functions.php b/include/functions.php index e86c97474..0d9c154d6 100644 --- a/include/functions.php +++ b/include/functions.php @@ -307,8 +307,8 @@ array("If-Modified-Since: ".gmdate('D, d M Y H:i:s \G\M\T', $timestamp))); } - curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : 15); - curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : 45); + curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : FILE_FETCH_CONNECT_TIMEOUT); + curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : FILE_FETCH_TIMEOUT); curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("safe_mode")); curl_setopt($ch, CURLOPT_MAXREDIRS, 20); curl_setopt($ch, CURLOPT_BINARYTRANSFER, true); |