Always set time limit (fixes #2844071)

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1006 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index 35b64940133cf4e1dee21068379ebb0f0b2f8259..3f1dc243c7b56aa4a4d2fea75b5f1a0ae300c1c8 100644 (file)
--- a/adminer/include/bootstrap.inc.php
+++ b/adminer/include/bootstrap.inc.php
@@ -67,6 +67,7 @@ if (get_magic_quotes_gpc()) {
     unset($process);
 }
 set_magic_quotes_runtime(false);
+@set_time_limit(0); // @ - can be disabled
 
 define("ME", preg_replace('~^[^?]*/([^?]*).*~', '\\1', $_SERVER["REQUEST_URI"]) . '?' . (strlen($_GET["server"]) ? 'server=' . urlencode($_GET["server"]) . '&' : '') . (strlen($_GET["db"]) ? 'db=' . urlencode($_GET["db"]) . '&' : ''));
 $on_actions = array("RESTRICT", "CASCADE", "SET NULL", "NO ACTION"); // used in foreign_keys()

diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index 464808721b13cfb4c6bda6bca0d1b0ecb174189f..ec5b853a142c5fb151860681df99209b359beb85 100644 (file)
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -10,7 +10,6 @@ page_header(lang('SQL command'), $error);
 if (!$error && $_POST) {
        $query = (isset($_POST["file"]) ? get_file("sql_file") : $_POST["query"]);
        if (is_string($query)) { // get_file() returns error as number
-               @set_time_limit(0); // set_time_limit() can be disabled
                $query = str_replace("\r", "", $query); // parser looks for \n
                $query = rtrim($query);
                if (strlen($query) && (!$history || end($history) != $query)) { // don't add repeated