diff options
Diffstat (limited to 'ext/standard/file.c')
| -rw-r--r-- | ext/standard/file.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ext/standard/file.c b/ext/standard/file.c index f7af63bcf4..106f5c1004 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)); } /* }}} */ @@ -2054,11 +2057,11 @@ PHPAPI void php_fgetcsv(php_stream *stream, char delimiter, char enclosure, char char *tmp = bptr; while ((*tmp != delimiter) && isspace((int)*(unsigned char *)tmp)) { tmp++; - } + } if (*tmp == enclosure) { bptr = tmp; } - } + } if (first_field && bptr == line_end) { add_next_index_null(return_value); @@ -2445,7 +2448,7 @@ PHP_FUNCTION(sys_get_temp_dir) if (zend_parse_parameters_none() == FAILURE) { return; } - RETURN_STRING((char *)php_get_temporary_directory(), 1); + RETURN_STRING((char *)php_get_temporary_directory(TSRMLS_C), 1); } /* }}} */ |