Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #65028 	Phar::buildFromDirectory creates corrupt archives for some specific contents

diff --cc NEWS
index 12ab11913008b596ce2a48fff9c7cc9537aa9030,f76497b3e44e83783bd3663671346faaf357d156..d1ff284323e86faf4089622eebf5bb76f6c46347
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -9,37 -6,38 +9,41 @@@ PH
    . Fixed bug #65304 (Use of max int in array_sum). (Laruence)
    . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
      limited case). (Arpad)
 -  . Improve fix for bug #63186 (compile failure on netbsd). (Matteo)
  
 -- Session:
 -  . Fixed bug #62129 (rfc1867 crashes php even though turned off). (gxd305 at
 -    gmail dot com)
 -  . Fixed bug #50308 (session id not appended properly for empty anchor tags).
 -    (Arpad)
 +- PDO_mysql:
 +  . Fixed bug #65299 (pdo mysql parsing errors). (Johannes)
  
 -?? ??? 2013, PHP 5.4.18
+ - Phar:
+   . Fixed bug #65028 (Phar::buildFromDirectory creates corrupt archives for 
+     some specific contents). (Stas)
+ 
 +- SPL:
 +  . Added RecursiveTreeIterator setPostfix and getPostifx methods. (Joshua 
 +    Thijssen)
 +  . Fixed bug #61697 (spl_autoload_functions returns lambda functions 
 +    incorrectly). (Laruence)
 +
 +- Streams:
 +  . Fixed bug #65268 (select() implementation uses outdated tick API). (Anatol)
 +
 +18 Jul 2013, PHP 5.5.1
  
  - Core:
 -  . Fixed value of FILTER_SANITIZE_FULL_SPECIAL_CHARS constant (previously was
 -    erroneously set to FILTER_SANITIZE_SPECIAL_CHARS value). (Andrey 
 -    avp200681 gmail com).
    . Fixed bug #65254 (Exception not catchable when exception thrown in autoload
      with a namespace). (Laruence)
 -  . Fixed bug #65108 (is_callable() triggers Fatal Error). 
 -    (David Soria Parra, Laruence)
    . Fixed bug #65088 (Generated configure script is malformed on OpenBSD).
      (Adam)
 -  . Fixed bug #62964 (Possible XSS on "Registered stream filters" info).
 -    (david at nnucomputerwhiz dot com)
 -  . Fixed bug #62672 (Error on serialize of ArrayObject). (Lior Kaplan)
 -  . Fixed bug #62475 (variant_* functions causes crash when null given as an 
 -    argument). (Felipe)
 -  . Fixed bug #60732 (php_error_docref links to invalid pages). (Jakub Vrana)
 +  . Fixed bug #65108 (is_callable() triggers Fatal Error). 
 +    (David Soria Parra, Laruence)
 +  . Fixed bug #65035 (yield / exit segfault). (Nikita)
 +  . Fixed bug #65161 (Generator + autoload + syntax error = segfault). (Nikita)
 +  . hex2bin() raises E_WARNING for invalid hex string. (Yasuo)
    . Fixed bug #65226 (chroot() does not get enabled). (Anatol)
  
 +- OPcache
 +  . Fixed bug #64827 (Segfault in zval_mark_grey (zend_gc.c)). (Laruence)
 +  . OPcache must be compatible with LiteSpeed SAPI (Dmitry)
 +
  - CGI:
    . Fixed Bug #65143 (Missing php-cgi man page). (Remi)
  

diff --cc ext/phar/phar.c
Simple merge