Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #67865

diff --cc NEWS
index 476602582e04d909b55503b5d38cdba814141a51,a34be3a47f0835450ac09f27748a22779d070764..d374dfebf6503a1e0b31ed57d65ad47bc0bde2fe
--- 1/NEWS
--- 2/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).

diff --cc ext/zlib/zlib_filter.c
Simple merge