- #48779, improve fix, drop usage of _tolower and use zend_strtolower

diff --git a/main/php_ini.c b/main/php_ini.c
index b7fe029385c5f04da0ca6e744a4cffdecbc1b1d6..8f43f045ab327b8e4bd8032265ba58acc8e25b7e 100644 (file)
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -47,7 +47,7 @@
                char *tmp = path; \
                while (*tmp) { \
                        if (*tmp == '\\') *tmp = '/'; \
-                       else *tmp = (__isascii(*tmp)) ? _tolower(*tmp) : tolower(*tmp); \
+                       else *tmp = tolower(*tmp); \
                                tmp++; \
                } \
        }

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 2cd30d1bdbc8220d1438a94e09a9437a88c363e7..38f63410b984650d12f731b1fe4039611c7bce73 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -817,7 +817,7 @@ static int sapi_cgi_activate(TSRMLS_D)
                path[path_len] = 0;
 #ifdef PHP_WIN32
                /* paths on windows should be case-insensitive */
-               strlwr(path);
+               zend_str_tolower(path, path_len);
 #endif
 
                /* Activate per-dir-system-configuration defined in php.ini and stored into configuration_hash during startup */
@@ -835,7 +835,7 @@ static int sapi_cgi_activate(TSRMLS_D)
 #ifdef PHP_WIN32
                                /* paths on windows should be case-insensitive */
                                doc_root = estrndup(doc_root, doc_root_len);
-                               strlwr(doc_root);
+                               zend_str_tolower(doc_root, doc_root_len);
 #endif
                                php_cgi_ini_activate_user_config(path, path_len, doc_root, doc_root_len, doc_root_len - 1 TSRMLS_CC);
                        }