iliaa Fri Oct 25 15:33:10 2002 EDT
Modified files:
/php4/ext/standard basic_functions.c
Log:
Cleanup (make sterling happy).
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.537
php4/ext/standard/basic_functions.c:1.538
--- php4/ext/standard/basic_functions.c:1.537 Thu Oct 24 21:06:46 2002
+++ php4/ext/standard/basic_functions.c Fri Oct 25 15:33:09 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.537 2002/10/25 01:06:46 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.538 2002/10/25 19:33:09 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2344,13 +2344,11 @@
}
}
-#define _CHECK_SAFEMODE_INI(ini, var) strncmp(ini, Z_STRVAL_PP(var), sizeof(ini))
-
/* checks that ensure the user does not overwrite certain ini settings when
safe_mode is enabled */
if (PG(safe_mode)) {
- if (!_CHECK_SAFEMODE_INI("max_execution_time", varname) ||
- !_CHECK_SAFEMODE_INI("memory_limit", varname) ||
- !_CHECK_SAFEMODE_INI("child_terminate", varname)) {
+ if (!strncmp("max_execution_time", Z_STRVAL_PP(varname),
+sizeof("max_execution_time")) ||
+ !strncmp("memory_limit", Z_STRVAL_PP(varname),
+sizeof("memory_limit")) ||
+ !strncmp("child_terminate", Z_STRVAL_PP(varname),
+sizeof("child_terminate"))) {
zval_dtor(return_value);
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
