Fixed a bug that causes crash when environment variable is access while parsing php.ini
Merge branch 'master' of git.php.net:php-src
Merge branch 'master' of git://github.com/php/php-src