Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #68095 - invalid read in php_getopt()

diff --cc NEWS
index 5f9e41d065225c3dce9b525a71dba71ff5feefd1,15a2951377ca0ff9a6b4d3ccd2337062adf1d955..2f300b1ea727c3fba8ee75427167fb6ea1df03f5
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,28 -1,16 +1,30 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2014, PHP 5.5.19
 +?? ??? 2014, PHP 5.6.3
  
  - Core:
-   . Fixed bug #67739 (Windows 8.1/Server 2012 R2 OS build number reported
-     as 6.2 (instead of 6.3)). (Christian Wenz)
 -  . Fixed bug #68095 (AddressSanitizer reports a heap buffer overflow in 
++  . Implemented 64-bit format codes for pack() and unpack(). (Leigh)
++  . Fixed bug #51800 (proc_open on Windows hangs forever). (Anatol)
 +  . Fixed bug #67633 (A foreach on an array returned from a function not doing
 +    copy-on-write). (Nikita)
-   . Fixed bug #51800 (proc_open on Windows hangs forever). (Anatol)
++  . Fixed bug #67739 (Windows 8.1/Server 2012 R2 OS build number reported
++    as 6.2 (instead of 6.3)). (Christian Wenz)
++  . Fixed bug #67949 (DOMNodeList elements should be accessible through
++    array notation) (Florian)
++  . Fixed bug #68095 (AddressSanitizer reports a heap buffer overflow in
+     php_getopt()). (Stas)
    . Fixed bug #68118 ($a->foo .= 'test'; can leave $a->foo undefined). (Nikita)
 -  . Fixed bug #68129 (parse_url() - incomplete support for empty usernames
 +  . Fixed bug #68129 (parse_url() - incomplete support for empty usernames 
      and passwords) (Tjerk)
-   . Fixed bug #67949 (DOMNodeList elements should be accessible through
-     array notation) (Florian)
-   . Implemented 64-bit format codes for pack() and unpack(). (Leigh)
  
 +- phpdbg:
 +  . Added XML protocol (-x command line flag). (Bob)
 +  . Added hard interruptions (twice SIGINT). (Bob)
 +
  - Fileinfo:
    . Fixed bug #66242 (libmagic: don't assume char is signed). (ArdB)
 +  . Fixed bug #68224 (buffer-overflow in libmagic/readcdf.c caught by
 +    AddressSanitizer). (Remi)
    . Fixed bug #68283 (fileinfo: out-of-bounds read in elf note headers).
      (CVE-2014-3710) (Remi)