diff options
| author | Xinchen Hui <laruence@php.net> | 2011-12-07 10:28:56 +0000 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2011-12-07 10:28:56 +0000 |
| commit | 04208580049c33263bb532aecadcc1b8f416158e (patch) | |
| tree | 59bdece3b4ce4b4277274d94d1ebce59449d1a0e /main/php_ini.c | |
| parent | 8b8dcede6c22081986a67e12c47a9817d79eeb68 (diff) | |
| download | php-git-04208580049c33263bb532aecadcc1b8f416158e.tar.gz | |
Merge -r317306 to trunk
Diffstat (limited to 'main/php_ini.c')
| -rw-r--r-- | main/php_ini.c | 6 |
1 files changed, 5 insertions, 1 deletions
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; + } } } } |