clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

- fix possible issue in TS environment (we don't have to do that anymore anyway in 5.3+)

Browse Source
This commit is contained in:
Pierre Joye 2009-10-11 21:04:35 +00:00
parent 4d63bd1132
commit 112379ba24
1 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
main/php_ini.c
View File

@ -507,33 +507,18 @@ int php_init_config(TSRMLS_D)
}
strlcat(php_ini_search_path, default_location, search_path_size);
}
/* For people running under terminal services, GetWindowsDirectory will
* return their personal Windows directory, so lets add the system
* windows directory too */
if (0 < GetSystemWindowsDirectory(default_location, MAXPATHLEN)) {
if (*php_ini_search_path) {
strlcat(php_ini_search_path, paths_separator, search_path_size);
}
strlcat(php_ini_search_path, default_location, search_path_size);
}
efree(default_location);
{
/* For people running under terminal services, GetWindowsDirectory will
* return their personal Windows directory, so lets add the system
* windows directory too */
typedef UINT (WINAPI *get_system_windows_directory_func)(char *buffer, UINT size);
static get_system_windows_directory_func get_system_windows_directory = NULL;
HMODULE kern;
if (get_system_windows_directory == NULL) {
kern = LoadLibrary("kernel32.dll");
if (kern) {
get_system_windows_directory = (get_system_windows_directory_func)GetProcAddress(kern, "GetSystemWindowsDirectoryA");
}
}
if (get_system_windows_directory != NULL) {
default_location = (char *) emalloc(MAXPATHLEN + 1);
if (0 < get_system_windows_directory(default_location, MAXPATHLEN)) {
if (*php_ini_search_path) {
strlcat(php_ini_search_path, paths_separator, search_path_size);
}
strlcat(php_ini_search_path, default_location, search_path_size);
}
efree(default_location);
}
}
#else
default_location = PHP_CONFIG_FILE_PATH;
if (*php_ini_search_path) {