Merge branch 'master' of https://github.com/oscarotero/Embed

Author: oscarotero

src/ImageInfo/Curl.php

@@ -103,13 +103,19 @@ public function __construct($url, $finfo, array $config = null)
             $this->config = array_replace($this->config, $config);
         }
 
-        curl_setopt_array($this->connection, [
+        $options = [
             CURLOPT_RETURNTRANSFER => false,
             CURLOPT_FOLLOWLOCATION => true,
             CURLOPT_URL => $url,
             CURLOPT_HEADERFUNCTION => [$this, 'headerCallback'],
             CURLOPT_WRITEFUNCTION => [$this, 'writeCallback'],
-        ] + $this->config);
+        ] + $this->config;
+
+        if (ini_get('open_basedir') || filter_var(ini_get('safe_mode'), FILTER_VALIDATE_BOOLEAN)) {
+            $options[CURLOPT_FOLLOWLOCATION] = false;
+        }
+
+        curl_setopt_array($this->connection, $options);
     }
 
     /**
@@ -148,10 +154,10 @@ public function getUrl()
 
     /**
      * Callback used to save the headers.
-     * 
+     *
      * @param resource $connection
      * @param string   $string
-     * 
+     *
      * @return int
      */
     public function headerCallback($connection, $string)

src/RequestResolvers/Curl.php

@@ -150,15 +150,21 @@ protected function resolve()
 
         $connection = curl_init();
 
-        curl_setopt_array($connection, [
+        $options = [
             CURLOPT_RETURNTRANSFER => false,
             CURLOPT_FOLLOWLOCATION => true,
             CURLOPT_URL => $this->url,
             CURLOPT_COOKIEJAR => self::$tmpCookies,
             CURLOPT_COOKIEFILE => self::$tmpCookies,
             CURLOPT_HEADERFUNCTION => [$this, 'headerCallback'],
             CURLOPT_WRITEFUNCTION => [$this, 'writeCallback'],
-        ] + $this->config);
+        ] + $this->config;
+
+        if (ini_get('open_basedir') || filter_var(ini_get('safe_mode'), FILTER_VALIDATE_BOOLEAN)) {
+            $options[CURLOPT_FOLLOWLOCATION] = false;
+        }
+
+        curl_setopt_array($connection, $options);
 
         $result = curl_exec($connection);