Merge pull request #47 from pierrocknroll/master

Add curl timeout option
willvincent · Jul 19, 2018 · 00689db · 00689db
2 parents ffb4ccd + 304df95
commit 00689db
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/FeedsFactory.php b/src/FeedsFactory.php
@@ -43,6 +43,9 @@ public function make($feed_url = [], $limit = 0, $force_feed = false, $options =
         } else {
             $this->simplepie->strip_attributes(false);
         }
+        if (isset($this->config['curl.timeout']) && is_int($this->config['curl.timeout'])) {
+            $this->simplepie->set_timeout($this->config['curl.timeout']);
+        }
         if (isset($options) && is_array($options)) {
             if (isset($options['curl.options']) && is_array($options['curl.options'])) {
                 $this->simplepie->set_curl_options($this->simplepie->curl_options + $options['curl.options']);
@@ -53,6 +56,9 @@ public function make($feed_url = [], $limit = 0, $force_feed = false, $options =
             if (isset($options['strip_attribute.tags']) && is_array($options['strip_attribute.tags'])) {
                 $this->simplepie->strip_attributes($options['strip_attribute.tags']);
             }
+            if (isset($options['curl.timeout']) && is_int($options['curl.timeout'])) {
+                $this->simplepie->set_timeout($options['curl.timeout']);
+            }
         }
         $this->simplepie->init();
 

diff --git a/src/config/feeds.php b/src/config/feeds.php
@@ -93,5 +93,7 @@
   |
   */
   'curl.options' => null,
+
+  'curl.timeout' => null,
 
 ];
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,5 +93,7 @@ @@
       |
       */
       'curl.options' => null,
+      'curl.timeout' => null,
     ];