From: Hartmut Holzgraefe <hholzgra@php.net>
Date: Wed, 27 Jul 2005 15:12:18 +0000 (+0000)
Subject: php.ini search logic needs to use the absolute path of the running binary
X-Git-Tag: RELEASE_2_0_0~97
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e071d9a1f9c254448e78686f056390494a2deac;p=php

php.ini search logic needs to use the absolute path of the running binary
when looking for php.ini in the directory the php binary is installed in
---

diff --git a/main/php_ini.c b/main/php_ini.c
index e6dd1b8a34..452687f2d8 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -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);