From b5c51cf040582e4e6bf445b9efe86df71e8586b1 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 14 May 2015 11:23:35 +0530 Subject: [PATCH 1/2] bug #4903 & bug #4367 Import status infinite loop Signed-off-by: Madhura Jayaratne --- import_status.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/import_status.php b/import_status.php index a6c49f4b79..87c6132bef 100644 --- a/import_status.php +++ b/import_status.php @@ -51,6 +51,7 @@ if (version_compare(PHP_VERSION, '5.4.0', '>=') define('PMA_MINIMUM_COMMON', 1); require_once 'libraries/common.inc.php'; +require_once 'libraries/Util.class.php'; require_once 'libraries/display_import_ajax.lib.php'; /* @@ -86,9 +87,23 @@ if (isset($_GET["message"]) && $_GET["message"]) { // which is set inside import.php usleep(300000); + $maximumTime = ini_get('max_execution_time'); + $timestamp = time(); // wait until message is available while ($_SESSION['Import_message']['message'] == null) { + // close session before sleeping + session_write_close(); + // sleep usleep(250000); // 0.25 sec + // reopen session + session_start(); + + if ((time() - $timestamp) > $maximumTime) { + $_SESSION['Import_message']['message'] = PMA_Message::error( + __('Could not load the progress of the import.') + )->getDisplay(); + break; + } } echo $_SESSION['Import_message']['message']; From ef806b39e592290d32aa4a2cf9e59c37f924d4d2 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 14 May 2015 11:27:17 +0530 Subject: [PATCH 2/2] ChangeLog entry for bug #4367 Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 525b80ce90..97b31efda2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog - bug Error when the reporting server is down - bug Escape database and table names for partition maintenance - bug Invalid value for CURLOPT_SSL_VERIFYPEER +- bug #4367 Import status infinite loop 4.4.6.1 (2015-05-13) - bug #4899 [security] CSRF vulnerability in setup