Always fall back to script tag on iOS devices as it does not use cache, fix script fallback (do not use obfuscation for proxies)

2 files changed, 15 insertions, 11 deletions

diff --git a/itjs.php b/itjs.php
index f8a19a2..fb41ec6 100644
--- a/itjs.php
+++ b/itjs.php
@@ -70,7 +70,8 @@ if ($checksum != $_SERVER['HTTP_IF_NONE_MATCH'])
 	if ($_REQUEST['boot'])
 	{
 		$data .= "window.it_boot_init();\n";
-		$data = sprintf("/*sln:%d*/\n%s/*eln:%d*/", strlen($data), strtr($data, array('%' => "%25", '.' => "%2e", 'e' => "%65", 'i' => "%69")), strlen($data));	# Protect from Firewalls/Proxies altering Javascript source code
+		if (!$_REQUEST['script'])
+			$data = sprintf("/*sln:%d*/\n%s/*eln:%d*/", strlen($data), strtr($data, array('%' => "%25", '.' => "%2e", 'e' => "%65", 'i' => "%69")), strlen($data));	# Protect from Firewalls/Proxies altering Javascript source code
 	}
 
 	echo it_untaint($data);
diff --git a/itjs/boot.js b/itjs/boot.js
index 50e7a26..059bd78 100644
--- a/itjs/boot.js
+++ b/itjs/boot.js
@@ -163,16 +163,19 @@ function it_boot_getloader()
 {
 	var result = null;
 
-	try
-	{
-		result = new XMLHttpRequest();
-	}
-	catch (e)
+	if (!navigator.userAgent.match(/iPhone|iP.d/))	// Do not use XMLHttpRequest on iOS devices as it does not use cache
 	{
-		var classnames = [ 'MSXML2.XMLHTTP', 'Microsoft.XMLHTTP' ];
+		try
+		{
+			result = new XMLHttpRequest();
+		}
+		catch (e)
+		{
+			var classnames = [ 'MSXML2.XMLHTTP', 'Microsoft.XMLHTTP' ];
 
-		for (var i in classnames)
-			try { result = new ActiveXObject(classnames[i]); break; } catch (e) {}
+			for (var i in classnames)
+				try { result = new ActiveXObject(classnames[i]); break; } catch (e) {}
+		}
 	}
 
 	return result;
@@ -233,11 +236,11 @@ function it_boot(file, isretry)
 		it_boot.sequence += "n";
 
 		if (window.opera || (document.all && navigator.platform.indexOf("Mac") >= 0))
-			document.write('<sc'+'ript type="text/javascript" src="'+it_boot_addparam(file, 'boot=1')+'"><\/sc'+'ript>');
+			document.write('<sc'+'ript type="text/javascript" src="'+it_boot_addparam(file, 'boot=1&script=1')+'"><\/sc'+'ript>');
 		else if (dom)
 		{
 			var tag = doc.createElement("script");
-			tag.src = it_boot_addparam(file, 'boot=1&retry=1');
+			tag.src = it_boot_addparam(file, 'boot=1&script=1&retry=1');
 			dom.appendChild(tag);
 		}
 		else