summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmb@php.net>2015-08-15 02:27:09 +0200
committerChristoph M. Becker <cmb@php.net>2015-08-15 02:27:09 +0200
commitc63b50557318132723494d945ae284f517ab2e16 (patch)
treeee14caa17cd1ef0d82e4816a8bb11e3cbb38b6c3
parent243b9f6592f7b52a8efdc5aa0759166c920d8562 (diff)
parenta4e05391880dc165e7d59357b3e69a04b534e87d (diff)
downloadphp-git-c63b50557318132723494d945ae284f517ab2e16.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: fixed wrong params in proto
-rw-r--r--ext/standard/user_filters.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c
index fc2141f73b..96bbfa273b 100644
--- a/ext/standard/user_filters.c
+++ b/ext/standard/user_filters.c
@@ -473,7 +473,7 @@ static void php_stream_bucket_attach(int append, INTERNAL_FUNCTION_PARAMETERS)
}
/* }}} */
-/* {{{ proto void stream_bucket_prepend(resource brigade, resource bucket)
+/* {{{ proto void stream_bucket_prepend(resource brigade, object bucket)
Prepend bucket to brigade */
PHP_FUNCTION(stream_bucket_prepend)
{
@@ -481,7 +481,7 @@ PHP_FUNCTION(stream_bucket_prepend)
}
/* }}} */
-/* {{{ proto void stream_bucket_append(resource brigade, resource bucket)
+/* {{{ proto void stream_bucket_append(resource brigade, object bucket)
Append bucket to brigade */
PHP_FUNCTION(stream_bucket_append)
{