diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-06-30 03:49:54 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-06-30 03:49:54 +0200 |
| commit | 6ad9cd5367734276d624d6d2a03406ed0d0cd08b (patch) | |
| tree | ba04d82653fcddb1d294a836930335b58011c1f2 /main/streams | |
| parent | 4a2e40bb861bc3cf5fb6863e57486ed60316e97c (diff) | |
| download | php-git-6ad9cd5367734276d624d6d2a03406ed0d0cd08b.tar.gz | |
Only call stream_flush if anything was written
This avoids flushing in readonly mode upon close
Diffstat (limited to 'main/streams')
| -rw-r--r-- | main/streams/streams.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c index b6a2887cfd..e8fa1e89b3 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -434,8 +434,10 @@ fprintf(stderr, "stream_free: %s:%p[%s] preserve_handle=%d release_cast=%d remov (close_options & PHP_STREAM_FREE_RSRC_DTOR) == 0); #endif - /* make sure everything is saved */ - _php_stream_flush(stream, 1); + if (stream->flags & PHP_STREAM_FLAG_WAS_WRITTEN) { + /* make sure everything is saved */ + _php_stream_flush(stream, 1); + } /* If not called from the resource dtor, remove the stream from the resource list. */ if ((close_options & PHP_STREAM_FREE_RSRC_DTOR) == 0 && stream->res) { @@ -1205,6 +1207,8 @@ PHPAPI int _php_stream_flush(php_stream *stream, int closing) _php_stream_write_filtered(stream, NULL, 0, closing ? PSFS_FLAG_FLUSH_CLOSE : PSFS_FLAG_FLUSH_INC ); } + stream->flags &= ~PHP_STREAM_FLAG_WAS_WRITTEN; + if (stream->ops->flush) { ret = stream->ops->flush(stream); } @@ -1214,15 +1218,23 @@ PHPAPI int _php_stream_flush(php_stream *stream, int closing) PHPAPI size_t _php_stream_write(php_stream *stream, const char *buf, size_t count) { + size_t bytes; + if (buf == NULL || count == 0 || stream->ops->write == NULL) { return 0; } if (stream->writefilters.head) { - return _php_stream_write_filtered(stream, buf, count, PSFS_FLAG_NORMAL); + bytes = _php_stream_write_filtered(stream, buf, count, PSFS_FLAG_NORMAL); } else { - return _php_stream_write_buffer(stream, buf, count); + bytes = _php_stream_write_buffer(stream, buf, count); } + + if (bytes) { + stream->flags |= PHP_STREAM_FLAG_WAS_WRITTEN; + } + + return bytes; } PHPAPI size_t _php_stream_printf(php_stream *stream, const char *fmt, ...) |