From: Adam Harvey <aharvey@php.net>
Date: Fri, 13 Jun 2014 01:15:07 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.15RC1~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25464340087e0e6a2ff663b349630f4423fea033;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Follow 308 Permanent Redirect responses.
---

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