From f3eb3888541718f910055729b6375217ba0f73aa Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 31 Aug 2015 16:55:03 -0400 Subject: [PATCH] Fixes #11448 Clarify doc about the MemoryLimit directive Signed-off-by: Marc Delisle --- ChangeLog | 1 + doc/config.rst | 8 +++++--- libraries/config.default.php | 2 +- libraries/config/messages.inc.php | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe8d0bfa11..f69d7c1c79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,6 +98,7 @@ phpMyAdmin - ChangeLog - issue #11436 CREATE DATABASE should be enabled by default on server exports - issue #11442 MySQL 5.7 and SHOW VARIABLES - issue #11445 MySQL 5.7 and Status page for an unprivileged user +- issue #11448 Clarify doc about the MemoryLimit directive 4.4.15.0 (not yet released) - issue #11411 Undefined "replace" function on numeric scalar diff --git a/doc/config.rst b/doc/config.rst index 65ca198ba7..47664bdb24 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -1263,10 +1263,12 @@ Generic settings :default: ``'-1'`` Set the number of bytes a script is allowed to allocate. If set to - ``'-1'``, no limit is imposed. + ``'-1'``, no limit is imposed. If set to ``'0'``, no change of the + memory limit is attempted and the :file:`php.ini` ``memory_limit`` is + used. - This setting is used while importing/exporting dump files and at some other - places in phpMyAdmin so you definitely don't want to put here a too low + This setting is used while importing/exporting dump files + so you definitely don't want to put here a too low value. It has no effect when PHP is running in safe mode. You can also use any string as in :file:`php.ini`, eg. '16M'. Ensure you diff --git a/libraries/config.default.php b/libraries/config.default.php index 5d40fcfe81..f059f5bfd0 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -720,7 +720,7 @@ $cfg['ExecTimeLimit'] = 300; $cfg['SessionSavePath'] = ''; /** - * maximum allocated bytes ('-1' for no limit) + * maximum allocated bytes ('-1' for no limit, '0' for no change) * this is a string because '16M' is a valid value; we must put here * a string as the default value so that /setup accepts strings * diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index efee01ce55..9f5b512d59 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -463,7 +463,7 @@ $strConfigMaxTableList_desc = __( $strConfigMaxTableList_name = __('Maximum tables'); $strConfigMemoryLimit_desc = __( 'The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] ' - . '([kbd]0[/kbd] for no limit).' + . '([kbd]-1[/kbd] for no limit and [kbd]0[/kbd] for no change).' ); $strConfigMemoryLimit_name = __('Memory limit'); $strConfigShowDatabasesNavigationAsTree_desc = __(