Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #64604

diff --cc NEWS
index 654e7b6a1b2862cd864d06427619e37130554f9a,3de1f3d330fbf8ed85dd84349663becc8fba2170..42c0bdf070785c4a7b546e1d83a42aacde2fd860
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,18 -1,17 +1,20 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2014, PHP 5.5.12
 +?? ??? 2014, PHP 5.6.0 Beta 2
 +
  - Core:
 -  . Fixed bug #61019 (Out of memory on command stream_get_contents). (Mike)
 -  . Fixed bug #64330 (stream_socket_server() creates wrong Abstract Namespace 
 -    UNIX sockets). (Mike)
+   . Fixed bug #64604 (parse_url is inconsistent with specified port).
+     (Ingo Walz)
 -  . Fixed bug #66182 (exit in stream filter produces segfault). (Mike)  
 -  . Fixed bug #66736 (fpassthru broken). (Mike)
 +  . Fixed bug #66015 (Unexpected array indexing in class's static property). (Bob)
 +  . Added (constant) string/array dereferencing to static scalar expressions
 +    to complete the set; now possible thanks to bug #66015 being fixed. (Bob)
 +  . Fixed bug #66568 (Update reflection information for unserialize() function).
 +    (Ferenc)
 +  . Fixed bug #66660 (Composer.phar install/update fails). (Ferenc)
    . Fixed bug #67024 (getimagesize should recognize BMP files with negative
      height). (Gabor Buella)
 -  . Fixed bug #67043 (substr_compare broke by previous change) (Tjerk)
 +  . Fixed bug #67064  (Countable interface prevents using 2nd parameter
 +    ($mode) of count() function). (Bob)
  
  - cURL:
    . Fixed bug #66562 (curl_exec returns differently than curl_multi_getcontent).