Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Follow 308 Permanent Redirect responses.

diff --cc NEWS
index 79d65010f6fc3d5f2f72426011c5c9491c3cbb9c,24253a877c568496773e4bea7f08f95d504b7555..717d57b9e6fa080facae966aae10a03c499fe47e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -10,7 -10,10 +10,10 @@@ PH
    . Implemented FR #67429 (CLI server is missing some new HTTP response codes).
      (Adam)
  
 -?? ??? 2014, PHP 5.4.30
+ - Streams:
+   . Fixed bug #67430 (http:// wrapper doesn't follow 308 redirects). (Adam)
+ 
 +?? ??? 2014, PHP 5.5.14
  
  - Core:
    . Fixed BC break introduced by patch for bug #67072. (Anatol)