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

php · Oct 12, 2009 · e5d4b01 · e5d4b01
1 parent 884cf3f
commit e5d4b01
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -820,7 +820,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 */
@@ -838,7 +838,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);
 			}