Skip to content
Browse files

Fix bug #48880

The ini entry was being corrupted because it wasn't being set
on the ACTIVATE and DEACTIVATE stages.
  • Loading branch information...
1 parent f56d6b6 commit 8608857c1a833ce87ece01f9aafc08a51ce7f566 @rlerdorf rlerdorf committed
Showing with 2 additions and 1 deletion.
  1. +1 −0 NEWS
  2. +1 −1 main/fopen_wrappers.c
View
1 NEWS
@@ -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)
View
2 main/fopen_wrappers.c
@@ -93,7 +93,7 @@ PHPAPI ZEND_INI_MH(OnUpdateBaseDir)
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;

0 comments on commit 8608857

Please sign in to comment.
Something went wrong with that request. Please try again.