From 448dbac84f310885c35f42c34de9e503c2c9b95b Mon Sep 17 00:00:00 2001 From: Hannes Magnusson Date: Sun, 6 May 2007 14:01:26 +0000 Subject: MFH: Fixed PHP CLI to use the php.ini from the binary location --- main/php_ini.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'main/php_ini.c') diff --git a/main/php_ini.c b/main/php_ini.c index 5fe320eeaf..ae39d81d5b 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -353,7 +353,26 @@ int php_init_config(TSRMLS_D) #else if (sapi_module.executable_location) { binary_location = (char *)emalloc(PATH_MAX); - if (!realpath(sapi_module.executable_location, binary_location)) { + if (!strchr(sapi_module.executable_location, '/')) { + char *path; + int found = 0; + + if ((path = getenv("PATH")) != NULL) { + char *search_dir, search_path[MAXPATHLEN]; + + while ((search_dir = strsep(&path, ":")) != NULL) { + snprintf(search_path, MAXPATHLEN, "%s/%s", search_dir, sapi_module.executable_location); + if (VCWD_REALPATH(search_path, binary_location) && !VCWD_ACCESS(binary_location, X_OK)) { + found = 1; + break; + } + } + } + if (!found) { + efree(binary_location); + binary_location = NULL; + } + } else if (!VCWD_REALPATH(sapi_module.executable_location, binary_location) || VCWD_ACCESS(binary_location, X_OK)) { efree(binary_location); binary_location = NULL; } -- cgit v1.2.1