com php-src: Fixed bugs #47675 and #64577 (fd leak on Solaris): main/main.c
| From: | Rasmus Lerdorf | Date: | Fri, 05 Apr 2013 02:24:12 +0000 |
| Subject: | com php-src: Fixed bugs #47675 and #64577 (fd leak on Solaris): main/main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71865@lists.php.net to get a copy of this message | ||
Commit: cb54fada51adfa9d19ee21740efe09bf3b2befe1
Author: Rasmus Lerdorf <rasmus@php.net> Thu, 4 Apr 2013 19:24:12 -0700
Parents: e9cc55a803ef7db15ab0feb1029f5d7cb8b67c6a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cb54fada51adfa9d19ee21740efe09bf3b2befe1
Log:
Fixed bugs #47675 and #64577 (fd leak on Solaris)
Bugs:
https://bugs.php.net/47675
https://bugs.php.net/64577
Changed paths:
M main/main.c
Diff:
diff --git a/main/main.c b/main/main.c
index a792fb6..40304c7 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)