felipe Fri, 09 Oct 2009 20:01:16 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=289446
Log:
- Fixed build and comment-style
Changed paths:
U php/php-src/branches/PHP_5_3/main/php_ini.c
U php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c
U php/php-src/trunk/main/php_ini.c
U php/php-src/trunk/sapi/cgi/cgi_main.c
Modified: php/php-src/branches/PHP_5_3/main/php_ini.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/php_ini.c 2009-10-09 19:43:00 UTC (rev
289445)
+++ php/php-src/branches/PHP_5_3/main/php_ini.c 2009-10-09 20:01:16 UTC (rev
289446)
@@ -288,7 +288,7 @@
is_special_section = 1;
has_per_dir_config = 1;
#ifdef PHP_WIN32
- // make the path lowercase on Windows,
for case insensitivty.
+ /* make the path lowercase on Windows,
for case insensitivty. */
strlwr(key);
TRANSLATE_SLASHES(key);
@@ -301,7 +301,7 @@
key_len = Z_STRLEN_P(arg1) -
sizeof("HOST") + 1;
is_special_section = 1;
has_per_host_config = 1;
- strlwr(key); // host names are
case-insensitive.
+ zend_str_tolower(key, key_len); /* host
names are case-insensitive. */
} else {
is_special_section = 0;
Modified: php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c 2009-10-09 19:43:00 UTC
(rev 289445)
+++ php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c 2009-10-09 20:01:16 UTC
(rev 289446)
@@ -794,8 +794,8 @@
/* SERVER_NAME should also be defined at this stage..but better
check it anyway */
if (server_name) {
server_name_len = strlen(server_name);
- server_name = estrndup(server_name, strlen(server_name)
);
- strlwr(server_name);
+ server_name = estrndup(server_name, server_name_len);
+ zend_str_tolower(server_name, server_name_len);
php_ini_activate_per_host_config(server_name,
server_name_len + 1 TSRMLS_CC);
efree(server_name);
}
@@ -819,7 +819,7 @@
}
path[path_len] = 0;
#ifdef PHP_WIN32
- // paths on windows should be case-insensitive
+ /* paths on windows should be case-insensitive */
strlwr(path);
#endif
@@ -836,7 +836,7 @@
--doc_root_len;
}
#ifdef PHP_WIN32
- // paths on windows should be case-insensitive
+ /* paths on windows should be case-insensitive
*/
doc_root = estrndup(doc_root, doc_root_len);
strlwr(doc_root);
#endif
Modified: php/php-src/trunk/main/php_ini.c
===================================================================
--- php/php-src/trunk/main/php_ini.c 2009-10-09 19:43:00 UTC (rev 289445)
+++ php/php-src/trunk/main/php_ini.c 2009-10-09 20:01:16 UTC (rev 289446)
@@ -288,7 +288,7 @@
is_special_section = 1;
has_per_dir_config = 1;
#ifdef PHP_WIN32
- // make the path lowercase on Windows,
for case insensitivty.
+ /* make the path lowercase on Windows,
for case insensitivty. */
strlwr(key);
TRANSLATE_SLASHES(key);
@@ -301,7 +301,7 @@
key_len = Z_STRLEN_P(arg1) -
sizeof("HOST") + 1;
is_special_section = 1;
has_per_host_config = 1;
- strlwr(key); // host names are
case-insensitive.
+ zend_str_tolower(key, key_len); /* host
names are case-insensitive. */
} else {
is_special_section = 0;
Modified: php/php-src/trunk/sapi/cgi/cgi_main.c
===================================================================
--- php/php-src/trunk/sapi/cgi/cgi_main.c 2009-10-09 19:43:00 UTC (rev
289445)
+++ php/php-src/trunk/sapi/cgi/cgi_main.c 2009-10-09 20:01:16 UTC (rev
289446)
@@ -791,8 +791,8 @@
/* SERVER_NAME should also be defined at this stage..but better
check it anyway */
if (server_name) {
server_name_len = strlen(server_name);
- server_name = estrndup(server_name, strlen(server_name)
);
- strlwr(server_name);
+ server_name = estrndup(server_name, server_name_len);
+ zend_str_tolower(server_name, server_name_len);
php_ini_activate_per_host_config(server_name,
server_name_len + 1 TSRMLS_CC);
efree(server_name);
}
@@ -816,7 +816,7 @@
}
path[path_len] = 0;
#ifdef PHP_WIN32
- // paths on windows should be case-insensitive
+ /* paths on windows should be case-insensitive */
strlwr(path);
#endif
@@ -833,7 +833,7 @@
--doc_root_len;
}
#ifdef PHP_WIN32
- // paths on windows should be case-insensitive
+ /* paths on windows should be case-insensitive
*/
doc_root = estrndup(doc_root, doc_root_len);
strlwr(doc_root);
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
