Merge branch 'master' of https://github.com/gothfox/Tiny-Tiny-RSS.git into tunable...

[tt-rss.git] / include / functions.php

diff --git a/include/functions.php b/include/functions.php
index 5fe5c5a6584a08068fb9575bc085bc8a1f353e7d..e2a2282d51801dcfa31c79fc9a49106a91ac9122 100644 (file)
--- 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);