From 791239bfb548b7524c309e7c6c522165875ae4ea Mon Sep 17 00:00:00 2001
From: Urban Müller
Date: Tue, 17 Nov 2015 15:46:05 +0100
Subject: report empty redir urls, they cause loops

---
 it_url.class | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'it_url.class')

diff --git a/it_url.class b/it_url.class
index fb5a1ff..2279659 100644
--- a/it_url.class
+++ b/it_url.class
@@ -793,8 +793,8 @@ static function absolute($url=null)
 function redirect($url = null, $type = "temporary")
 {
 	$codes = array('permanent' => 301, 'temporary' => 303);	# NOTE: HTTP 303 is called "See Other", rather than Temporary (which would be HTTP 307), but is the behaviour one usually wants for temporary redirects
-	if (!($code = $codes[$type]))
-		it::fatal("Invalid redirect type '$type', must be 'permanent' or 'temporary'");
+	if (!($code = $codes[$type]) || !$url)
+		it::fatal("invalid redirect type or missing redirect url");
 
 	$url = preg_replace("/[\r\n].*/", '', it_url::absolute($url));	# Security: cut after CR/LF
 
-- 
cgit v1.2.3


From 382b4c87a721464a2521ca66414d2eccce6d4636 Mon Sep 17 00:00:00 2001
From: Urban Müller
Date: Mon, 7 Dec 2015 15:19:20 +0100
Subject: docs

---
 it_url.class | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'it_url.class')

diff --git a/it_url.class b/it_url.class
index 2279659..ab1f90f 100644
--- a/it_url.class
+++ b/it_url.class
@@ -529,10 +529,10 @@ function get_cache_filename($p)
 /**
  * Store contents of url in a file and return file name. Threadsafe: Provides locking. Called statically.
  * Requires webserver writeable directory in $p['cachdedir']. Params in associative array p:
+ * @param $p['id']          RECOMMENDED: If you need more than one type of cache (e.g. different maxage) you should specify an id
  * @param $p['url']         url to get
  * @param $p['headers']     optional array of HTTP headers to send
  * @param $p['cachedir']    directory to store cache files in, @see get_cache_dir
- * @param $p['id']          If you need more than one type of cache (e.g. different maxage) you can specify an id
  * @param $p['timeout']     timeout in seconds, default 10. fractions allowed
  * @param $p['maxage']      maximum age of cache entries in seconds, default 86400
  * @param $p['cleanbefore'] maximum daytime when attempting cleanup, default 7200
-- 
cgit v1.2.3