From: Pierre Joye <pajoye@php.net>
Date: Mon, 12 Oct 2009 14:40:27 +0000 (+0000)
Subject: - #48779, improve fix, drop usage of _tolower and use zend_strtolower
X-Git-Tag: php-5.4.0alpha1~191^2~2518
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29cec688e8e68ba298b7f968cecc672760cd918d;p=php

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

diff --git a/main/php_ini.c b/main/php_ini.c
index b7fe029385..8f43f045ab 100644
--- 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 2cd30d1bdb..38f63410b9 100644
--- 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);
 			}