diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-01-26 22:53:36 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-01-26 22:53:36 +0100 |
| commit | 5845f2c0c116accac6bdd60a6b35ff05aa604ca5 (patch) | |
| tree | 925045943e5a21bc0ca95315cd33fdc6f73b74e1 /main/streams/filter.c | |
| parent | 5f3dbab0fa67fac449e6139e3e38f942e3ef979a (diff) | |
| parent | 666cb333f725794892df7876889472aeee8e33fe (diff) | |
| download | php-git-5845f2c0c116accac6bdd60a6b35ff05aa604ca5.tar.gz | |
Merge branch 'PHP-5.6'
Conflicts:
NEWS
main/streams/filter.c
Diffstat (limited to 'main/streams/filter.c')
| -rw-r--r-- | main/streams/filter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/streams/filter.c b/main/streams/filter.c index eec603f0ba..b4705aa113 100644 --- a/main/streams/filter.c +++ b/main/streams/filter.c @@ -447,7 +447,7 @@ PHPAPI int _php_stream_filter_flush(php_stream_filter *filter, int finish) for(current = filter; current; current = current->next) { php_stream_filter_status_t status; - status = filter->fops->filter(stream, filter, inp, outp, NULL, flags); + status = filter->fops->filter(stream, current, inp, outp, NULL, flags); if (status == PSFS_FEED_ME) { /* We've flushed the data far enough */ return SUCCESS; |