$OpenBSD: patch-sapi_cgi_cgi_main_c,v 1.1 2011/06/18 19:49:50 sthen Exp $
--- sapi/cgi/cgi_main.c.orig.port	Sat Jun 18 12:44:54 2011
+++ sapi/cgi/cgi_main.c	Sat Jun 18 12:44:58 2011
@@ -1327,7 +1327,7 @@ int main(int argc, char *argv[])
 	char *orig_optarg = php_optarg;
 	char *script_file = NULL;
 	int ini_entries_len = 0;
-
+	char *ini;
 /* end of temporary locals */
 #ifdef ZTS
 	void ***tsrm_ls;
@@ -1379,8 +1379,12 @@ int main(int argc, char *argv[])
 	tsrm_ls = ts_resource(0);
 #endif
 
+	if ((ini = getenv("PHP_INI_PATH"))) {
+		cgi_sapi_module.php_ini_path_override = ini;
+	} else {
+		cgi_sapi_module.php_ini_path_override = NULL;
+	}
 	sapi_startup(&cgi_sapi_module);
-	cgi_sapi_module.php_ini_path_override = NULL;
 
 #ifdef PHP_WIN32
 	_fmode = _O_BINARY; /* sets default for file streams to binary */
