Fixes #112 check_encoding() can cause timeouts

mybb · Sep 9, 2014 · 965c29b · 965c29b
1 parent b510247
commit 965c29b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/index.php b/index.php
@@ -23,6 +23,9 @@
 define("IN_MYBB", 1);
 define("WRITE_LOGS", 1);
 define("TIME_NOW", time());
+// The encoding detection can cause timeout errors and is automatically skipped for larger strings
+// However this may also happen on smaller strings - set this to 1 if you have that problem
+define("SKIP_ENCODING_DETECTION", 1);
 
 if(function_exists('date_default_timezone_set') && !ini_get('date.timezone'))
 {

diff --git a/resources/functions.php b/resources/functions.php
@@ -859,7 +859,7 @@ function check_encoding($string, $encoding)
 	}
 
 	// These functions can have significant load or crash if the string passed is too long.
-	if(strlen($string) < 1024*5)
+	if(SKIP_ENCODING_DETECTION != 1 && strlen($string) < 1024*5)
 	{
 		return (preg_match('#^(?:
               [\x09\x0A\x0D\x20-\x7E]