summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--main/main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 1c52241b42..d876c36e6e 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@ PHP NEWS
- Core:
. Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap:
segfault). (Laruence)
-
+ . Fixed bugs #47675 and #64577 (fd leak on Solaris)
?? ??? 2013, PHP 5.3.24
diff --git a/main/main.c b/main/main.c
index 654cbf8c1b..4e0294c834 100644
--- a/main/main.c
+++ b/main/main.c
@@ -2231,7 +2231,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
zend_file_handle *prepend_file_p, *append_file_p;
zend_file_handle prepend_file = {0}, append_file = {0};
#if HAVE_BROKEN_GETCWD
- int old_cwd_fd = -1;
+ volatile int old_cwd_fd = -1;
#else
char *old_cwd;
ALLOCA_FLAG(use_heap)