Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64604

diff --cc NEWS
index 6ba540bae97d7848edcfc0c326b48d3fa2b6c5aa,d04e961a311ce003c84e646523032d23c598d1a4..3de1f3d330fbf8ed85dd84349663becc8fba2170
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -5,11 -6,12 +5,13 @@@ PH
    . 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). 
++  . Fixed bug #64604 (parse_url is inconsistent with specified port).
+     (Ingo Walz)
 -  . Fixed bug #66182 (exit in stream filter produces segfault). (Mike)
 +  . Fixed bug #66182 (exit in stream filter produces segfault). (Mike)  
    . Fixed bug #66736 (fpassthru broken). (Mike)
 -  . Fixed bug #67024 (getimagesize should recognize BMP files with negative 
 +  . Fixed bug #67024 (getimagesize should recognize BMP files with negative
      height). (Gabor Buella)
 +  . Fixed bug #67043 (substr_compare broke by previous change) (Tjerk)
  
  - cURL:
    . Fixed bug #66562 (curl_exec returns differently than curl_multi_getcontent).