com php-src: Fixed bugs #47675 and #64577 (fd leak on Solaris): NEWS main/main.c
| From: | Rasmus Lerdorf | Date: | Fri, 05 Apr 2013 02:15:52 +0000 |
| Subject: | com php-src: Fixed bugs #47675 and #64577 (fd leak on Solaris): NEWS main/main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71864@lists.php.net to get a copy of this message | ||
Commit: 1b60c189ad4e45d57df576ab180c5cb91c2db8a7
Author: Rasmus Lerdorf <rasmus@php.net> Thu, 4 Apr 2013 19:15:52 -0700
Parents: 934dfae4e1db7a31f29de3e94cbb8bb9b6c1aa3f
Branches: PHP-5.3
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1b60c189ad4e45d57df576ab180c5cb91c2db8a7
Log:
Fixed bugs #47675 and #64577 (fd leak on Solaris)
Bugs:
https://bugs.php.net/47675
https://bugs.php.net/64577
Changed paths:
M NEWS
M main/main.c
Diff:
diff --git a/NEWS b/NEWS
index 1c52241..d876c36 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 654cbf8..4e0294c 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)