aboutsummaryrefslogtreecommitdiff
path: root/lib/Favicon
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Favicon')
-rw-r--r--lib/Favicon/DataAccess.php2
-rw-r--r--lib/Favicon/Favicon.php3
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/Favicon/DataAccess.php b/lib/Favicon/DataAccess.php
index 838df66c3..1445e9343 100644
--- a/lib/Favicon/DataAccess.php
+++ b/lib/Favicon/DataAccess.php
@@ -32,6 +32,8 @@ class DataAccess {
array(
'http' => array(
'method' => 'GET',
+ 'follow_location' => 0,
+ 'max_redirects' => 1,
'timeout' => 10,
'header' => "User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:20.0; Favicon; +https://github.com/ArthurHoaro/favicon) Gecko/20100101 Firefox/32.0\r\n",
)
diff --git a/lib/Favicon/Favicon.php b/lib/Favicon/Favicon.php
index 39f45f139..c026d8a95 100644
--- a/lib/Favicon/Favicon.php
+++ b/lib/Favicon/Favicon.php
@@ -111,6 +111,9 @@ class Favicon
case '301':
case '302':
$url = isset($headers['location']) ? $headers['location'] : '';
+ if (is_array($url)) {
+ $url = end($url);
+ }
break;
default:
$loop = FALSE;