laruence Wed, 07 Dec 2011 10:28:56 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=320566
Log: Merge -r317306 to trunk Changed paths: U php/php-src/trunk/main/php_ini.c Modified: php/php-src/trunk/main/php_ini.c =================================================================== --- php/php-src/trunk/main/php_ini.c 2011-12-07 10:09:33 UTC (rev 320565) +++ php/php-src/trunk/main/php_ini.c 2011-12-07 10:28:56 UTC (rev 320566) @@ -421,7 +421,11 @@ env_location = ""; } else { size = GetEnvironmentVariableA("PHPRC", phprc_path, size); - env_location = phprc_path; + if (size == 0) { + env_location = ""; + } else { + env_location = phprc_path; + } } } }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php