From b1ded7ff7c1bba0ee920b3ae80a0da8b06b6a755 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@miniflux.net>
Date: Sat, 11 Apr 2015 09:40:09 -0400
Subject: [PATCH] Update PicoFeed

---
 vendor/autoload.php                                 |  2 +-
 vendor/composer/autoload_real.php                   | 10 +++++-----
 vendor/composer/installed.json                      |  8 ++++----
 vendor/fguillot/picofeed/docs/installation.markdown | 13 +++----------
 .../fguillot/picofeed/lib/PicoFeed/Client/Curl.php  |  1 +
 5 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/vendor/autoload.php b/vendor/autoload.php
index 1dbb1f2..60bac52 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInitfa142d3c582de229e6ed8fd200703820::getLoader();
+return ComposerAutoloaderInitf813f763f87d109605f7c55600b459d5::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 9669ef5..e346483 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitfa142d3c582de229e6ed8fd200703820
+class ComposerAutoloaderInitf813f763f87d109605f7c55600b459d5
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ class ComposerAutoloaderInitfa142d3c582de229e6ed8fd200703820
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitfa142d3c582de229e6ed8fd200703820', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitf813f763f87d109605f7c55600b459d5', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitfa142d3c582de229e6ed8fd200703820', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitf813f763f87d109605f7c55600b459d5', 'loadClassLoader'));
 
         $map = require __DIR__ . '/autoload_namespaces.php';
         foreach ($map as $namespace => $path) {
@@ -42,14 +42,14 @@ class ComposerAutoloaderInitfa142d3c582de229e6ed8fd200703820
 
         $includeFiles = require __DIR__ . '/autoload_files.php';
         foreach ($includeFiles as $file) {
-            composerRequirefa142d3c582de229e6ed8fd200703820($file);
+            composerRequiref813f763f87d109605f7c55600b459d5($file);
         }
 
         return $loader;
     }
 }
 
-function composerRequirefa142d3c582de229e6ed8fd200703820($file)
+function composerRequiref813f763f87d109605f7c55600b459d5($file)
 {
     require $file;
 }
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index c9ad89a..f626e28 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -162,12 +162,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/fguillot/picoFeed.git",
-            "reference": "3a0dce6bd3a62566c5f8414f7884f959753762f7"
+            "reference": "273c344b35b468b6c8053f635332c3a404f8c7b9"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/3a0dce6bd3a62566c5f8414f7884f959753762f7",
-            "reference": "3a0dce6bd3a62566c5f8414f7884f959753762f7",
+            "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/273c344b35b468b6c8053f635332c3a404f8c7b9",
+            "reference": "273c344b35b468b6c8053f635332c3a404f8c7b9",
             "shasum": ""
         },
         "require": {
@@ -181,7 +181,7 @@
         "suggest": {
             "ext-curl": "PicoFeed will use cURL if present"
         },
-        "time": "2015-04-10 23:28:18",
+        "time": "2015-04-11 12:46:50",
         "bin": [
             "picofeed"
         ],
diff --git a/vendor/fguillot/picofeed/docs/installation.markdown b/vendor/fguillot/picofeed/docs/installation.markdown
index 9bf1450..ecc6b3b 100644
--- a/vendor/fguillot/picofeed/docs/installation.markdown
+++ b/vendor/fguillot/picofeed/docs/installation.markdown
@@ -5,14 +5,7 @@ Versions
 --------
 
 - Development version: master
-- Available versions:
-    - v0.1.2 (stable)
-    - v0.1.1
-    - v0.1.0
-    - v0.0.2
-    - v0.0.1
-
-Note: The public API has changed between 0.0.x and 0.1.0
+- Stable version: v0.1.3
 
 Installation with Composer
 --------------------------
@@ -22,7 +15,7 @@ Configure your `composer.json`:
 ```json
 {
     "require": {
-        "fguillot/picofeed": "0.1.2"
+        "fguillot/picofeed": "0.1.3"
     }
 }
 ```
@@ -30,7 +23,7 @@ Configure your `composer.json`:
 Or simply:
 
 ```bash
-composer require fguillot/picofeed:0.1.2
+composer require fguillot/picofeed:0.1.3
 ```
 
 And download the code:
diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Client/Curl.php b/vendor/fguillot/picofeed/lib/PicoFeed/Client/Curl.php
index 3dec58c..4ad3f14 100644
--- a/vendor/fguillot/picofeed/lib/PicoFeed/Client/Curl.php
+++ b/vendor/fguillot/picofeed/lib/PicoFeed/Client/Curl.php
@@ -236,6 +236,7 @@ class Curl extends Client
 
         curl_setopt($ch, CURLOPT_URL, $this->url);
         curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+        curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->timeout);
         curl_setopt($ch, CURLOPT_USERAGENT, $this->user_agent);
         curl_setopt($ch, CURLOPT_HTTPHEADER, $this->prepareHeaders());