summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2003-10-20 01:59:48 +0000
committerIlia Alshanetsky <iliaa@php.net>2003-10-20 01:59:48 +0000
commit2361e1e34219c226a96fa42fd6a090a2df437d6f (patch)
treed110b2b63b14fa81912e80aa6384adbe34d8d8dc
parente41125d052890538f3fa42354e7901afaa119e27 (diff)
downloadphp-git-2361e1e34219c226a96fa42fd6a090a2df437d6f.tar.gz
MFH: Fixed bug #25895 (Incorrect detection of safe_mode limited ini options)
-rw-r--r--NEWS2
-rw-r--r--ext/standard/basic_functions.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 4a3a72fa26..6308917f03 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ PHP 4 NEWS
on request shutdown). (Wez)
- Fixed multibyte regex engine to properly handle ".*" pattern under
POSIX compatible mode. (K.Kosako <kosako at sofnec.co.jp>, Moriyoshi)
+- Fixed bug #25895 (Incorrect detection of safe_mode limited ini options).
+ (Ilia)
- Fixed bug #25836 (last key of multi-dimensional array passed via GPC not
being escaped when magic_quotes_gpc is on). (Ilia)
- Fixed bug #25814 (Make flock() return correct value when 3rd argument is
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 9f843d8e04..6725f8fc1a 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -2317,7 +2317,7 @@ static int php_ini_check_path(char *option_name, int option_len, char *new_optio
return 0;
}
- return strncmp(option_name, new_option_name, option_len);
+ return !strncmp(option_name, new_option_name, option_len);
}
/* {{{ proto string ini_set(string varname, string newvalue)