Revert to the old php_ini.c, and reimplement the binary-path searching.

Should now also work under UNIX (CLI/CGI)

2 files changed, 4 insertions, 0 deletions

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 46b967ba55..3c31a42922 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -565,6 +565,8 @@ int main(int argc, char *argv[])
 	tsrm_ls = ts_resource(0);
 #endif
 
+	cgi_sapi_module.executable_location = argv[0];
+
 	/* startup after we get the above ini override se we get things right */
 	if (php_module_startup(&cgi_sapi_module)==FAILURE) {
 #ifdef ZTS
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 6f496d23b2..3db7e6dce4 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -361,6 +361,8 @@ int main(int argc, char *argv[])
 	ap_php_optind = orig_optind;
 	ap_php_optarg = orig_optarg;
 
+	cli_sapi_module.executable_location = argv[0];
+
 	/* startup after we get the above ini override se we get things right */
 	if (php_module_startup(&cli_sapi_module)==FAILURE) {
 		return FAILURE;