nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work on 10MB chunks if no memory limit is set (bug #1399477).

Browse Source
This commit is contained in:
Michal Čihař
2006-01-09 10:24:20 +00:00
parent 32a39388f1
commit 3bac98ef23
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2006-01-09 Michal Čihař <michal@cihar.com>
* import.php: Work on 10MB chunks if no memory limit is set (bug
#1399477).
2006-01-07 Marc Delisle <lem9@users.sourceforge.net> 2006-01-07 Marc Delisle <lem9@users.sourceforge.net>
* sql.php: bug #1395590 Safari Bookmark query fieldset float problem, * sql.php: bug #1395590 Safari Bookmark query fieldset float problem,
thanks to Ryan Schmidt thanks to Ryan Schmidt

8
import.php
View File

@@ -171,7 +171,13 @@ if (!empty($bkm_label) && !empty($import_text)) {
// We can not read all at once, otherwise we can run out of memory // We can not read all at once, otherwise we can run out of memory
$memory_limit = trim(@ini_get('memory_limit')); $memory_limit = trim(@ini_get('memory_limit'));
// 2 MB as default // 2 MB as default
if (empty($memory_limit)) $memory_limit = 2 * 1024 * 1024; if (empty($memory_limit)) {
$memory_limit = 2 * 1024 * 1024;
}
// In case no memory limit we work on 10MB chunks
if ($memory_limit = -1) {
$memory_limit = 10 * 1024 * 1024;
}
// Calculate value of the limit // Calculate value of the limit
if (strtolower(substr($memory_limit, -1)) == 'm') $memory_limit = (int)substr($memory_limit, 0, -1) * 1024 * 1024; if (strtolower(substr($memory_limit, -1)) == 'm') $memory_limit = (int)substr($memory_limit, 0, -1) * 1024 * 1024;