com php-src: Merge branch 'PHP-5.6': main/streams/filter.c
| From: | Bob Weinand | Date: | Mon, 26 Jan 2015 21:53:36 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': main/streams/filter.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84383@lists.php.net to get a copy of this message | ||
Commit: 5845f2c0c116accac6bdd60a6b35ff05aa604ca5
Author: Bob Weinand <bobwei9@hotmail.com> Mon, 26 Jan 2015 22:53:36 +0100
Parents: 5f3dbab0fa67fac449e6139e3e38f942e3ef979a 666cb333f725794892df7876889472aeee8e33fe
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5845f2c0c116accac6bdd60a6b35ff05aa604ca5
Log:
Merge branch 'PHP-5.6'
Conflicts:
NEWS
main/streams/filter.c
Changed paths:
MM main/streams/filter.c
Diff:
diff --cc main/streams/filter.c
index eec603f,f349be4..b4705aa
--- a/main/streams/filter.c
+++ b/main/streams/filter.c
@@@ -447,7 -449,7 +447,7 @@@ PHPAPI int _php_stream_filter_flush(php
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 TSRMLS_CC);
++ status = filter->fops->filter(stream, current, inp, outp, NULL, flags);
if (status == PSFS_FEED_ME) {
/* We've flushed the data far enough */
return SUCCESS;