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 e6dd1b8a347c40f3014089ed62ef1d08bb621a5a..452687f2d878cc9dd38852d2e5a8f8b1ca45faef 100644 (file)
--- 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);