From 9af4f3db52fe0bd24534d14fb561a25a7cf15e74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= <contact@fredericguillot.com>
Date: Wed, 14 Aug 2013 21:18:23 -0400
Subject: [PATCH] Workaround for curl follow redirect + open base dir
 restrictions

---
 vendor/PicoFeed/Client.php       |  2 +-
 vendor/PicoFeed/Clients/Curl.php | 34 +++++++++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/vendor/PicoFeed/Client.php b/vendor/PicoFeed/Client.php
index 27a5b7a..e88ecaa 100644
--- a/vendor/PicoFeed/Client.php
+++ b/vendor/PicoFeed/Client.php
@@ -73,7 +73,7 @@ abstract class Client
 
         foreach ($lines as $line) {
 
-            if (strpos($line, 'HTTP') === 0 && strpos($line, '301') === false && strpos($line, '302') === false) {
+            if (strpos($line, 'HTTP') === 0/* && strpos($line, '301') === false && strpos($line, '302') === false*/) {
 
                 $status = (int) substr($line, 9, 3);
             }
diff --git a/vendor/PicoFeed/Clients/Curl.php b/vendor/PicoFeed/Clients/Curl.php
index d347cf7..a4d64d9 100644
--- a/vendor/PicoFeed/Clients/Curl.php
+++ b/vendor/PicoFeed/Clients/Curl.php
@@ -18,7 +18,6 @@ class Curl extends \PicoFeed\Client
         $this->body_length += $length;
 
         if ($this->body_length > $this->max_body_size) return -1;
-
         $this->body .= $buffer;
 
         return $length;
@@ -45,7 +44,7 @@ class Curl extends \PicoFeed\Client
     }
 
 
-    public function doRequest()
+    public function doRequest($follow_location = true)
     {
         $request_headers = array('Connection: close');
 
@@ -59,7 +58,7 @@ class Curl extends \PicoFeed\Client
         curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
         curl_setopt($ch, CURLOPT_USERAGENT, $this->user_agent);
         curl_setopt($ch, CURLOPT_HTTPHEADER, $request_headers);
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ini_get('open_basedir') === '');
         curl_setopt($ch, CURLOPT_MAXREDIRS, $this->max_redirects);
         curl_setopt($ch, CURLOPT_ENCODING, '');
         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); // For auto-signed certificates...
@@ -84,6 +83,35 @@ class Curl extends \PicoFeed\Client
 
         list($status, $headers) = $this->parseHeaders(explode("\r\n", $this->headers[$this->headers_counter - 1]));
 
+        if ($follow_location && ini_get('open_basedir') !== '' && ($status == 301 || $status == 302)) {
+
+            $nb_redirects = 0;
+            $this->url = $headers['Location'];
+            $this->body = '';
+            $this->body_length = 0;
+            $this->headers = array();
+            $this->headers_counter = 0;
+
+            while (true) {
+
+                $nb_redirects++;
+                if ($nb_redirects >= $this->max_redirects) return false;
+
+                $result = $this->doRequest(false);
+
+                if ($result['status'] == 301 || $result['status'] == 302) {
+                    $this->url = $result['headers']['Location'];
+                    $this->body = '';
+                    $this->body_length = 0;
+                    $this->headers = array();
+                    $this->headers_counter = 0;
+                }
+                else {
+                    return $result;
+                }
+            }
+        }
+
         return array(
             'status' => $status,
             'body' => $this->body,