Permalink
Browse files

php.ini search logic needs to use the absolute path of the running bi…

…nary

when looking for php.ini in the directory the php binary is installed in
  • Loading branch information...
1 parent 3674649 commit 7e071d9a1f9c254448e78686f056390494a2deac Hartmut Holzgraefe committed Jul 27, 2005
Showing with 6 additions and 2 deletions.
  1. +6 −2 main/php_ini.c
View
@@ -350,7 +350,11 @@ int php_init_config()
}
#else
if (sapi_module.executable_location) {
- binary_location = estrdup(sapi_module.executable_location);
+ binary_location = (char *)emalloc(PATH_MAX);
+ if (!realpath(sapi_module.executable_location, binary_location)) {
+ efree(binary_location);
+ binary_location = NULL;
+ }
} else {
binary_location = NULL;
}
@@ -359,7 +363,7 @@ int php_init_config()
char *separator_location = strrchr(binary_location, DEFAULT_SLASH);
if (separator_location) {
- *(separator_location+1) = 0;
+ *(separator_location) = 0;
}
if (*php_ini_search_path) {
strcat(php_ini_search_path, paths_separator);

0 comments on commit 7e071d9

Please sign in to comment.