From 04208580049c33263bb532aecadcc1b8f416158e Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Wed, 7 Dec 2011 10:28:56 +0000 Subject: Merge -r317306 to trunk --- main/php_ini.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'main/php_ini.c') diff --git a/main/php_ini.c b/main/php_ini.c index 7d7c26012e..1ffc08b187 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -421,7 +421,11 @@ int php_init_config(TSRMLS_D) env_location = ""; } else { size = GetEnvironmentVariableA("PHPRC", phprc_path, size); - env_location = phprc_path; + if (size == 0) { + env_location = ""; + } else { + env_location = phprc_path; + } } } } -- cgit v1.2.1