From 448dbac84f310885c35f42c34de9e503c2c9b95b Mon Sep 17 00:00:00 2001 From: Hannes Magnusson Date: Sun, 6 May 2007 14:01:26 +0000 Subject: [PATCH] MFH: Fixed PHP CLI to use the php.ini from the binary location --- NEWS | 1 + main/php_ini.c | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 7408ef9c0b..efc0b8e5bd 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,7 @@ PHP NEWS - Fixed ext/filter Email Validation Vulnerability (MOPB-24 by Stefan Esser) (Ilia) - Fixed altering $this via argument named "this". (Dmitry) +- Fixed PHP CLI to use the php.ini from the binary location. (Hannes) - Fixed bug #41287 (Namespace functions don't allow xmlns defintion to be optional). (Rob) - Fixed bug #41285 (Improved fix for CVE-2007-1887 to work with non-bundled 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; } -- 2.40.0