summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>1999-11-25 15:24:49 +0000
committerZeev Suraski <zeev@php.net>1999-11-25 15:24:49 +0000
commit442f8b3c3c0afab679be1a34ca46f5ebc970e517 (patch)
treebf37e335045637a228b7f644c0725e074f42f48d
parent7e3563c1c25df7ca124154424078dff029c82721 (diff)
downloadphp-git-442f8b3c3c0afab679be1a34ca46f5ebc970e517.tar.gz
*** empty log message ***
-rw-r--r--main/main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/main/main.c b/main/main.c
index 0c7baf0f73..39907b0c27 100644
--- a/main/main.c
+++ b/main/main.c
@@ -240,7 +240,9 @@ PHP_INI_BEGIN()
PHP_INI_ENTRY_EX("define_syslog_variables", "0", PHP_INI_ALL, NULL, php_ini_boolean_displayer_cb)
PHP_INI_ENTRY("max_execution_time", "30", PHP_INI_ALL, OnChangeMaxExecutionTime)
+#if MEMORY_LIMIT
PHP_INI_ENTRY("memory_limit", "8388608", PHP_INI_ALL, OnChangeMemoryLimit)
+#endif
#if PHP_TRACK_VARS /* "cc -32" on IRIX 6.4 does not like (PHP_TRACK_VARS?"1":"0") - thies 991004 */
STD_PHP_INI_BOOLEAN("track_vars", "1", PHP_INI_ALL, OnUpdateBool, track_vars, php_core_globals, core_globals)