Index: ext/bz2/bz2.c =================================================================== RCS file: /repository/php-src/ext/bz2/bz2.c,v retrieving revision 1.14.2.3.2.12.2.5 diff -u -p -r1.14.2.3.2.12.2.5 bz2.c --- ext/bz2/bz2.c 23 Jul 2008 08:56:29 -0000 1.14.2.3.2.12.2.5 +++ ext/bz2/bz2.c 23 Jul 2008 10:05:28 -0000 @@ -247,7 +247,6 @@ PHP_BZ2_API php_stream *_php_stream_bz2o if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD, (void **) &fd, REPORT_ERRORS)) { bz_file = BZ2_bzdopen(fd, mode); } - stream->flags |= PHP_STREAM_FLAG_FCLOSE; } /* remove the file created by php_stream_open_wrapper(), it is not needed since BZ2 functions @@ -261,7 +260,6 @@ PHP_BZ2_API php_stream *_php_stream_bz2o if (bz_file) { retstream = _php_stream_bz2open_from_BZFILE(bz_file, mode, stream STREAMS_REL_CC TSRMLS_CC); if (retstream) { - retstream->flags |= PHP_STREAM_FLAG_FCLOSE; return retstream; } Index: ext/standard/dir.c =================================================================== RCS file: /repository/php-src/ext/standard/dir.c,v retrieving revision 1.147.2.3.2.12.2.7 diff -u -p -r1.147.2.3.2.12.2.7 dir.c --- ext/standard/dir.c 11 Jun 2008 09:01:56 -0000 1.147.2.3.2.12.2.7 +++ ext/standard/dir.c 23 Jul 2008 10:05:28 -0000 @@ -220,6 +220,8 @@ static void _php_do_opendir(INTERNAL_FUN if (dirp == NULL) { RETURN_FALSE; } + + dirp->flags |= PHP_STREAM_FLAG_NO_FCLOSE; php_set_default_dir(dirp->rsrc_id TSRMLS_CC); Index: ext/standard/file.c =================================================================== RCS file: /repository/php-src/ext/standard/file.c,v retrieving revision 1.409.2.6.2.28.2.18 diff -u -p -r1.409.2.6.2.28.2.18 file.c --- ext/standard/file.c 22 Jul 2008 14:09:24 -0000 1.409.2.6.2.28.2.18 +++ ext/standard/file.c 23 Jul 2008 10:05:28 -0000 @@ -856,8 +856,6 @@ PHP_NAMED_FUNCTION(php_if_tmpfile) stream = php_stream_fopen_tmpfile(); if (stream) { - stream->flags |= PHP_STREAM_FLAG_FCLOSE; - php_stream_to_zval(stream, return_value); } else { RETURN_FALSE; @@ -888,8 +886,6 @@ PHP_NAMED_FUNCTION(php_if_fopen) RETURN_FALSE; } - stream->flags |= PHP_STREAM_FLAG_FCLOSE; - php_stream_to_zval(stream, return_value); } /* }}} */ @@ -907,7 +903,7 @@ PHPAPI PHP_FUNCTION(fclose) PHP_STREAM_TO_ZVAL(stream, &arg1); - if (!(stream->flags & PHP_STREAM_FLAG_FCLOSE)) { + if ((stream->flags & PHP_STREAM_FLAG_NO_FCLOSE) != 0) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a valid stream resource", stream->rsrc_id); RETURN_FALSE; } Index: ext/standard/fsock.c =================================================================== RCS file: /repository/php-src/ext/standard/fsock.c,v retrieving revision 1.121.2.1.2.1.2.2 diff -u -p -r1.121.2.1.2.1.2.2 fsock.c --- ext/standard/fsock.c 22 Jul 2008 14:09:24 -0000 1.121.2.1.2.1.2.2 +++ ext/standard/fsock.c 23 Jul 2008 10:05:28 -0000 @@ -79,8 +79,6 @@ static void php_fsockopen_stream(INTERNA stream = php_stream_xport_create(hostname, hostname_len, ENFORCE_SAFE_MODE | REPORT_ERRORS, STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT, hashkey, &tv, NULL, &errstr, &err); - stream->flags |= PHP_STREAM_FLAG_FCLOSE; - if (port > 0) { efree(hostname); } Index: ext/standard/proc_open.c =================================================================== RCS file: /repository/php-src/ext/standard/proc_open.c,v retrieving revision 1.36.2.1.2.17.2.3 diff -u -p -r1.36.2.1.2.17.2.3 proc_open.c --- ext/standard/proc_open.c 22 Jul 2008 14:09:24 -0000 1.36.2.1.2.17.2.3 +++ ext/standard/proc_open.c 23 Jul 2008 10:05:28 -0000 @@ -969,7 +969,7 @@ PHP_FUNCTION(proc_open) zval *retfp; /* nasty hack; don't copy it */ - stream->flags |= PHP_STREAM_FLAG_NO_SEEK | PHP_STREAM_FLAG_FCLOSE; + stream->flags |= PHP_STREAM_FLAG_NO_SEEK; MAKE_STD_ZVAL(retfp); php_stream_to_zval(stream, retfp); Index: ext/standard/streamsfuncs.c =================================================================== RCS file: /repository/php-src/ext/standard/streamsfuncs.c,v retrieving revision 1.58.2.6.2.15.2.18 diff -u -p -r1.58.2.6.2.15.2.18 streamsfuncs.c --- ext/standard/streamsfuncs.c 22 Jul 2008 14:09:24 -0000 1.58.2.6.2.15.2.18 +++ ext/standard/streamsfuncs.c 23 Jul 2008 10:05:29 -0000 @@ -155,8 +155,6 @@ PHP_FUNCTION(stream_socket_client) RETURN_FALSE; } - stream->flags |= PHP_STREAM_FLAG_FCLOSE; - if (errstr) { efree(errstr); } @@ -204,8 +202,6 @@ PHP_FUNCTION(stream_socket_server) STREAM_XPORT_SERVER | flags, NULL, NULL, context, &errstr, &err); - stream->flags |= PHP_STREAM_FLAG_FCLOSE; - if (stream == NULL) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to connect to %s (%s)", host, errstr == NULL ? "Unknown error" : errstr); } @@ -271,8 +267,6 @@ PHP_FUNCTION(stream_socket_accept) &tv, &errstr TSRMLS_CC) && clistream) { - clistream->flags |= PHP_STREAM_FLAG_FCLOSE; - if (peername) { ZVAL_STRINGL(zpeername, peername, peername_len, 0); } Index: ext/zip/zip_stream.c =================================================================== RCS file: /repository/php-src/ext/zip/zip_stream.c,v retrieving revision 1.1.2.5.2.1 diff -u -p -r1.1.2.5.2.1 zip_stream.c --- ext/zip/zip_stream.c 23 Jul 2008 09:09:10 -0000 1.1.2.5.2.1 +++ ext/zip/zip_stream.c 23 Jul 2008 10:05:29 -0000 @@ -140,7 +140,6 @@ php_stream *php_stream_zip_open(char *fi if (!stream) { return NULL; } else { - stream->flags |= PHP_STREAM_FLAG_FCLOSE; return stream; } Index: main/php_streams.h =================================================================== RCS file: /repository/php-src/main/php_streams.h,v retrieving revision 1.103.2.1.2.4.2.5 diff -u -p -r1.103.2.1.2.4.2.5 php_streams.h --- main/php_streams.h 22 Jul 2008 14:09:24 -0000 1.103.2.1.2.4.2.5 +++ main/php_streams.h 23 Jul 2008 10:05:29 -0000 @@ -183,7 +183,7 @@ struct _php_stream_wrapper { #define PHP_STREAM_FLAG_IS_DIR 64 -#define PHP_STREAM_FLAG_FCLOSE 128 +#define PHP_STREAM_FLAG_NO_FCLOSE 128 struct _php_stream { php_stream_ops *ops; Index: sapi/cli/php_cli.c =================================================================== RCS file: /repository/php-src/sapi/cli/php_cli.c,v retrieving revision 1.129.2.13.2.22.2.9 diff -u -p -r1.129.2.13.2.22.2.9 php_cli.c --- sapi/cli/php_cli.c 22 Jul 2008 14:09:24 -0000 1.129.2.13.2.22.2.9 +++ sapi/cli/php_cli.c 23 Jul 2008 10:05:29 -0000 @@ -502,10 +502,6 @@ static void cli_register_file_handles(TS return; } - s_in->flags |= PHP_STREAM_FLAG_FCLOSE; - s_out->flags |= PHP_STREAM_FLAG_FCLOSE; - s_err->flags |= PHP_STREAM_FLAG_FCLOSE; - #if PHP_DEBUG /* do not close stdout and stderr */ s_out->flags |= PHP_STREAM_FLAG_NO_CLOSE;