Merge branch 'PHP-5.6' into PHP-7.0

cmb69 · cmb69 · commit 60fc27f912f2 · 2016-07-04T03:18:50.000+02:00
diff --git a/ext/zlib/zlib_filter.c b/ext/zlib/zlib_filter.c
@@ -174,7 +174,7 @@ static php_stream_filter_ops php_zlib_inflate_ops = {
 };
 /* }}} */
 
-/* {{{ zlib.inflate filter implementation */
+/* {{{ zlib.deflate filter implementation */
 
 static php_stream_filter_status_t php_zlib_deflate_filter(
 	php_stream *stream,
