diff options
| author | Felipe Pena <felipe@php.net> | 2009-10-09 20:01:16 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2009-10-09 20:01:16 +0000 |
| commit | 994307d429ad51e271ff44d47358c2db090ffda0 (patch) | |
| tree | 04c114c3a1bc9383a3c6ab13064bceb275bc8366 | |
| parent | 8e5a00e546da89c6a7340754483ab749086f5e01 (diff) | |
| download | php-git-994307d429ad51e271ff44d47358c2db090ffda0.tar.gz | |
- Fixed build and comment-style
| -rw-r--r-- | main/php_ini.c | 4 | ||||
| -rw-r--r-- | sapi/cgi/cgi_main.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index 6c889f2ed4..0b31ad5c42 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -288,7 +288,7 @@ static void php_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callback_t 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 @@ static void php_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callback_t 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; diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 7732f6c7d9..29eaf406a2 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -794,8 +794,8 @@ static int sapi_cgi_activate(TSRMLS_D) /* 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 @@ static int sapi_cgi_activate(TSRMLS_D) } 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 @@ static int sapi_cgi_activate(TSRMLS_D) --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 |