summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2002-10-25 19:33:09 +0000
committerIlia Alshanetsky <iliaa@php.net>2002-10-25 19:33:09 +0000
commitfdd2cb6024df4a27ff899ef1e817f3cdda573b95 (patch)
tree055af1a7a1640dd2d9992c0c5ff43ffa8dd1140d
parent7e4beef623c28ec57b7c12432ba1da05cb05fc88 (diff)
downloadphp-git-fdd2cb6024df4a27ff899ef1e817f3cdda573b95.tar.gz
Cleanup (make sterling happy).
-rw-r--r--ext/standard/basic_functions.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 93f1a783c2..97e93650d7 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -2344,13 +2344,11 @@ PHP_FUNCTION(ini_set)
}
}
-#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;
}