Merge branch 'master' into tunable-fetches

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

diff --git a/include/functions.php b/include/functions.php
index e86c9747428aeec58bfddf753cf3bb797ce4cbbe..0d9c154d625037254060d99924a3d16b3139d2b4 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);