diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2013-04-04 19:15:52 -0700 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2013-04-04 19:15:52 -0700 |
| commit | 1b60c189ad4e45d57df576ab180c5cb91c2db8a7 (patch) | |
| tree | 9dbb888860e2ef3ccfe392fbb7a6e2e9fa79743b | |
| parent | 934dfae4e1db7a31f29de3e94cbb8bb9b6c1aa3f (diff) | |
| download | php-git-1b60c189ad4e45d57df576ab180c5cb91c2db8a7.tar.gz | |
Fixed bugs #47675 and #64577 (fd leak on Solaris)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | main/main.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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) |