rasmus Fri, 31 Jul 2009 21:09:45 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=286602
Log: Fix bug #48880 The ini entry was being corrupted because it wasn't being set on the ACTIVATE and DEACTIVATE stages. Bug: http://bugs.php.net/48880 (Open) Random Appearing open_basedir problem Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/main/fopen_wrappers.c U php/php-src/trunk/main/fopen_wrappers.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2009-07-31 21:01:18 UTC (rev 286601) +++ php/php-src/branches/PHP_5_3/NEWS 2009-07-31 21:09:45 UTC (rev 286602) @@ -8,6 +8,7 @@ - Fixed signature generation/validation for zip archives in ext/phar. (Greg) - Fixed memory leak in stream_is_local(). (Felipe) +- Fixed bug #48880 (Random Appearing open_basedir problem). (Rasmus+Gwynne) - Fixed bug #49108 (2nd scan_dir produces seg fault). (Felipe) - Fixed bug #49065 ("disable_functions" php.ini option does not work on Zend extensions). (Stas) Modified: php/php-src/branches/PHP_5_3/main/fopen_wrappers.c =================================================================== --- php/php-src/branches/PHP_5_3/main/fopen_wrappers.c 2009-07-31 21:01:18 UTC (rev 286601) +++ php/php-src/branches/PHP_5_3/main/fopen_wrappers.c 2009-07-31 21:09:45 UTC (rev 286602) @@ -93,7 +93,7 @@ p = (char **) (base + (size_t) mh_arg1); - if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN) { + if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN || stage == PHP_INI_STAGE_ACTIVATE || stage == PHP_INI_STAGE_DEACTIVATE) { /* We're in a PHP_INI_SYSTEM context, no restrictions */ *p = new_value; return SUCCESS; Modified: php/php-src/trunk/main/fopen_wrappers.c =================================================================== --- php/php-src/trunk/main/fopen_wrappers.c 2009-07-31 21:01:18 UTC (rev 286601) +++ php/php-src/trunk/main/fopen_wrappers.c 2009-07-31 21:09:45 UTC (rev 286602) @@ -92,7 +92,7 @@ p = (char **) (base + (size_t) mh_arg1); - if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN) { + if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN || stage == PHP_INI_STAGE_ACTIVATE || stage == PHP_INI_STAGE_DEACTIVATE) { /* We're in a PHP_INI_SYSTEM context, no restrictions */ *p = new_value; return SUCCESS;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
