diff options
| author | Ondřej Surý <ondrej@sury.org> | 2013-02-19 13:28:10 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2013-02-19 13:28:10 +0100 |
| commit | 54098cf044025ec5965b8ea9c84750f9631d85b6 (patch) | |
| tree | ed0ef32b379c0cdfe20fcafc5b27c4488732fe90 /ext/standard/file.c | |
| parent | 8572aeb0703107705fc7dde35961cd6a5f89c0c8 (diff) | |
| download | php-upstream/5.5.0_alpha4.tar.gz | |
Imported Upstream version 5.5.0~alpha4upstream/5.5.0_alpha4
Diffstat (limited to 'ext/standard/file.c')
| -rw-r--r-- | ext/standard/file.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/standard/file.c b/ext/standard/file.c index 74577ac49..cf8b15955 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -159,6 +159,7 @@ static ZEND_RSRC_DTOR_FUNC(file_context_dtor) static void file_globals_ctor(php_file_globals *file_globals_p TSRMLS_DC) { FG(pclose_ret) = 0; + FG(pclose_wait) = 0; FG(user_stream_current_filename) = NULL; FG(def_chunk_size) = PHP_SOCK_CHUNK_SIZE; FG(wrapper_errors) = NULL; @@ -960,7 +961,9 @@ PHP_FUNCTION(pclose) PHP_STREAM_TO_ZVAL(stream, &arg1); + FG(pclose_wait) = 1; zend_list_delete(stream->rsrc_id); + FG(pclose_wait) = 0; RETURN_LONG(FG(pclose_ret)); } /* }}} */ |