Fixed bugs #47675 and #64577 (fd leak on Solaris)

diff --git a/NEWS b/NEWS
index ce3f78a5ad117544a7fb8be8b96b98396d93631c..179db2fae81e9c977e2ca8bc1bc26e38f8bce009 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ PHP                                                                        NEWS
   . Fixed bug #64565 (copy doesn't report failure on partial copy). (Remi)
   . Fixed bug #64555 (foreach no longer copies keys if they are interned).
     (Nikita Popov)
+  . Fixed bugs #47675 and #64577 (fd leak on Solaris)
 
 - CURL:
   . Added CURL_WRAPPERS_ENABLE constant. (Laruence)

diff --git a/main/main.c b/main/main.c
index 325ef7ed531b3ba23abb257b55ac6dde41355125..355afbca8f3ed50485fc742fa1f5e528c0a715ad 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -2397,8 +2397,8 @@ 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;
+#if HAVE_BROKEN_GETCWD 
+       volatile int old_cwd_fd = -1;
 #else
        char *old_cwd;
        ALLOCA_FLAG(use_heap)