diff options
author | Michael Wallner <mike@php.net> | 2013-09-17 13:44:02 +0200 |
---|---|---|
committer | Michael Wallner <mike@php.net> | 2013-09-17 13:44:50 +0200 |
commit | 0f78d8612a7b16f1bbe3fb80a99896d7163c0aa7 (patch) | |
tree | 8b6045eff973c61115249920392170a6c4bf425c /ext/standard/php_fopen_wrapper.c | |
parent | 41d78110ffd576a9afa352426ed2c15ab7308bec (diff) | |
download | php-git-0f78d8612a7b16f1bbe3fb80a99896d7163c0aa7.tar.gz |
we need to use the full stream wrapper for filters
Diffstat (limited to 'ext/standard/php_fopen_wrapper.c')
-rw-r--r-- | ext/standard/php_fopen_wrapper.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/standard/php_fopen_wrapper.c b/ext/standard/php_fopen_wrapper.c index ca0b92ebde..f624cf4958 100644 --- a/ext/standard/php_fopen_wrapper.c +++ b/ext/standard/php_fopen_wrapper.c @@ -73,8 +73,8 @@ static size_t php_stream_input_read(php_stream *stream, char *buf, size_t count { php_stream *inner = stream->abstract; - if (inner && inner->ops->read) { - size_t read = inner->ops->read(inner, buf, count TSRMLS_CC); + if (inner) { + size_t read = php_stream_read(inner, buf, count); stream->eof = inner->eof; return read; } @@ -99,8 +99,10 @@ static int php_stream_input_seek(php_stream *stream, off_t offset, int whence, o { php_stream *inner = stream->abstract; - if (inner && inner->ops->seek) { - return inner->ops->seek(inner, offset, whence, newoffset TSRMLS_CC); + if (inner) { + int sought = php_stream_seek(inner, offset, whence); + *newoffset = inner->position; + return sought; } return -1; |