From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 10 Jul 2013 16:18:20 +0000 (+0400)
Subject: geturl: limit amount of redirects
X-Git-Tag: 1.9~55
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=fe61dc18233a46f521bbf4884fc25f3e78e1c684;p=tt-rss.git

geturl: limit amount of redirects
---

diff --git a/include/functions.php b/include/functions.php
index d71f81ac..8a8f7b5d 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -4090,7 +4090,9 @@
 		return in_array($interface, class_implements($class));
 	}
 
-	function geturl($url){
+	function geturl($url, $depth = 0){
+
+		if ($depth == 20) return $url;
 
 		if (!function_exists('curl_init'))
 			return user_error('CURL Must be installed for geturl function to work. Ask your host to enable it or uncomment extension=php_curl.dll in php.ini', E_USER_ERROR);
@@ -4129,7 +4131,7 @@
 				preg_match("/(Location:|URI:)[^(\n)]*/", $header, $matches);
 				$url = trim(str_replace($matches[1],"",$matches[0]));
 				$url_parsed = parse_url($url);
-				return (isset($url_parsed))? geturl($url):'';
+				return (isset($url_parsed))? geturl($url, $depth + 1):'';
 			}
 
 			global $fetch_last_error;