com php-src: Fixed bugs #47675 and #64577 (fd leak on Solaris): NEWS main/main.c

Commit: 569eddce0f8ff0f0b61c4760ca45d3b871b5156d Author: Rasmus Lerdorf <rasmus@php.net> Thu, 4 Apr 2013 19:22:28 -0700 Parents: 185e5e15ae5e6d69f667dcc51205db23e0db8eb0 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=569eddce0f8ff0f0b61c4760ca45d3b871b5156d 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 c39ef92..a107dd6 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ PHP NEWS segfault). (Laruence) . Fixed bug #64433 (follow_location parameter of context is ignored for most response codes). (Sergey Akbarov) + . Fixed bugs #47675 and #64577 (fd leak on Solaris) - CURL: . Add CURL_WRAPPERS_ENABLE constant. (Laruence) diff --git a/main/main.c b/main/main.c index be289c8..7a253f8 100644 --- a/main/main.c +++ b/main/main.c @@ -2406,8 +2406,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)