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

Commit: c3a57fff5e4b5a964fef8b30506ff252d9cf146a Author: Rasmus Lerdorf <rasmus@php.net> Thu, 4 Apr 2013 19:23:22 -0700 Parents: 9587cf385e9c0220cbd999a13ed73ce5e496515b Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c3a57fff5e4b5a964fef8b30506ff252d9cf146a 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 ce3f78a..179db2f 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 325ef7e..355afbc 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)