From: Rasmus Lerdorf <rasmus@php.net>
Date: Fri, 5 Apr 2013 02:23:22 +0000 (-0700)
Subject: Fixed bugs #47675 and #64577 (fd leak on Solaris)
X-Git-Tag: php-5.5.0beta3~8^2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c3a57fff5e4b5a964fef8b30506ff252d9cf146a;p=php

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

diff --git a/NEWS b/NEWS
index ce3f78a5ad..179db2fae8 100644
--- 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 325ef7ed53..355afbca8f 100644
--- 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)