MFH: Fixed bug #25895 (Incorrect detection of safe_mode limited ini options)

diff --git a/NEWS b/NEWS
index 4a3a72fa26a8dc12eb304fbcad4384deffaadd9f..6308917f0302114c065e1b31eafe3ba75a9b6f6a 100644 (file)
--- 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 9f843d8e042fc4f1c173bb78ca9b11af2fe6c6d8..6725f8fc1afd82c6e3523f19073d8aa8eda08cb1 100644 (file)
--- 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)