Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Follow 308 Permanent Redirect responses.

diff --cc NEWS
index 1adc56b15fd78403cc7b5e7751200cfd9d60de2b,717d57b9e6fa080facae966aae10a03c499fe47e..490ccea7a674cc491439785c54b571bbd998bba4
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -41,51 -63,49 +41,54 @@@ PH
  
  - SPL:
    . Fixed bug #66127 (Segmentation fault with ArrayObject unset). (Stas)
 -  . Fixed bug #67359 (Segfault in recursiveDirectoryIterator). (Laruence)
 -  . Fixed bug #67360 (Missing element after ArrayObject::getIterator). (Adam)
  
 -29 May 2014, PHP 5.5.13
++- Streams:
++  . Fixed bug #67430 (http:// wrapper doesn't follow 308 redirects). (Adam)
+ 
 -- CLI server:
 -  . Fixed bug #67079 (Missing MIME types for XML/XSL files). (Anatol)
 +- Tokenizer:
 +  . Fixed bug #67395 (token_name() does not return name for T_POW and T_POW_EQUAL
 +    token). (Ferenc)
  
 -- COM:
 -  . Fixed bug #66431 (Special Character via COM Interface (CP_UTF8)). (Anatol)
 +05 Jun 2014, PHP 5.6.0 Beta 4
  
  - Core:
 -  . Fixed bug #65701 (copy() doesn't work when destination filename is created
 -    by tempnam()). (Boro Sitnikovski)
 -  . Fixed bug #67072 (Echoing unserialized "SplFileObject" crash). (Anatol)
 -  . Fixed bug #67245 (usage of memcpy() with overlapping src and dst in
 -    zend_exceptions.c). (Bob)
 -  . Fixed bug #67247 (spl_fixedarray_resize integer overflow). (Stas)
    . Fixed bug #67249 (printf out-of-bounds read). (Stas)
 -  . Fixed bug #67250 (iptcparse out-of-bounds read). (Stas)
 -  . Fixed bug #67252 (convert_uudecode out-of-bounds read). (Stas)
 -
 -- Curl:
 -  . Fixed bug #64247 (CURLOPT_INFILE doesn't allow reset). (Mike)
  
  - Date:
 -  . Fixed bug #67118 (DateTime constructor crash with invalid data). (Anatol)
 -  . Fixed bug #67251 (date_parse_from_format out-of-bounds read). (Stas)
 -  . Fixed bug #67253 (timelib_meridian_with_check out-of-bounds read). (Stas)
 +  . Fixed bug #67308 (Serialize of DateTime truncates fractions of second).
 +    (Adam)
 +  . Fixed regression in fix for bug #67118 (constructor can't be called twice).
 +    (Remi)
  
 -- DOM:
 -  . Fixed bug #67081 (DOMDocumentType->internalSubset returns entire DOCTYPE tag,
 -    not only the subset). (Anatol)
  
  - Fileinfo:
 -  . Fixed bug #66307 (Fileinfo crashes with powerpoint files). (Anatol)
 -  . Fixed bug #67327 (fileinfo: CDF infinite loop in nelements DoS) (CVE-2014-0238).
 +  . Fixed bug #67327 (fileinfo: CDF infinite loop in nelements DoS).
    . Fixed bug #67328 (fileinfo: fileinfo: numerous file_printf calls resulting in
 -    performance degradation) (CVE-2014-0237).
 +    performance degradation).
 +  . Fixed bug #67326 (fileinfo: cdf_read_short_sector insufficient boundary check).
 +  . Fixed bug #67329 (fileinfo: NULL pointer deference flaw by processing certain
 +    CDF files).
  
 -- FPM:
 -  . Fixed bug #66908 (php-fpm reload leaks epoll_create() file descriptor).
 -    (Julio Pintos)
 +- SPL:
 +  . Fixed bug #67359 (Segfault in recursiveDirectoryIterator). (Laruence)
 +
 +- phpdbg:
 +  . Fixed bug which caused phpdbg to fail immediately on startup in non-debug
 +    builds. (Bob)
 +
 +15 May 2014, PHP 5.6.0 Beta 3
 +
 +- Core:
 +  . Fixed bug #67169 (array_splice all elements, then []= gives wrong index).
 +    (Nikita)
 +  . Fixed bug #67198 (php://input regression). (Mike)
 +  . Fixed bug #67247 (spl_fixedarray_resize integer overflow). (Stas)
 +  . Fixed bug #67250 (iptcparse out-of-bounds read). (Stas)
 +  . Fixed bug #67252 (convert_uudecode out-of-bounds read). (Stas)
 +
 +- Date:
 +  . Fixed bug #67251 (date_parse_from_format out-of-bounds read). (Stas)
 +  . Fixed bug #67253 (timelib_meridian_with_check out-of-bounds read). (Stas)
  
  - GD:
    . Fixed bug #67248 (imageaffinematrixget missing check of parameters). (Stas)

diff --cc ext/standard/http_fopen_wrapper.c
Simple merge