cvs: /php4 main.c
| From: | Zeev Suraski | Date: | Thu, 25 Nov 1999 15:25:20 +0000 |
| Subject: | cvs: /php4 main.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-6889@lists.php.net to get a copy of this message | ||
zeev Thu Nov 25 10:25:20 1999 EDT
Modified files:
/php4 main.c
Log:
Index: php4/main.c
diff -u php4/main.c:1.138 php4/main.c:1.139
--- php4/main.c:1.138 Wed Nov 24 12:56:30 1999
+++ php4/main.c Thu Nov 25 10:24:49 1999
@@ -19,7 +19,7 @@
*/
-/* $Id: main.c,v 1.138 1999/11/24 17:56:30 sas Exp $ */
+/* $Id: main.c,v 1.139 1999/11/25 15:24:49 zeev Exp $ */
#include <stdio.h>
@@ -240,7 +240,9 @@
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)