com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS ext/zlib/zlib_filter.c
| From: | Michael Wallner | Date: | Thu, 21 Aug 2014 20:43:25 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS ext/zlib/zlib_filter.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80682@lists.php.net to get a copy of this message | ||
Commit: c4fb183b9fd6fecf7dfb8df309bfa34ff1ec2e53
Author: Michael Wallner <mike@php.net> Thu, 21 Aug 2014 22:42:14 +0200
Parents: dbbf1c2a3cff5908afd5229c58e52440073116f8 54fbbded372b771cf281a73e1981cde642107924
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c4fb183b9fd6fecf7dfb8df309bfa34ff1ec2e53
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix bug #67865
Bugs:
https://bugs.php.net/67865
Changed paths:
MM NEWS
MM ext/zlib/zlib_filter.c
Diff:
diff --cc NEWS
index 4766025,a34be3a..d374dfe
--- a/NEWS
+++ b/NEWS
@@@ -34,8 -21,9 +34,9 @@@ PH
- Zlib:
. Fixed bug #67724 (chained zlib filters silently fail with large amounts of
data). (Mike)
- . Fixed bug #67865 (internal corruption phar error). (Mike)
++ . Fixed bug #67865 (internal corruption phar error). Mike
-?? ??? 2014, PHP 5.4.32
+21 Aug 2014, PHP 5.5.16
- COM:
. Fixed missing type checks in com_event_sink (Yussuf Khalil, Stas).