Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #67587: Redirection loop on nginx with FPM

diff --cc NEWS
index cfdd26cc59ebd313106d370b80c7b867432992fa,ff025e142a477ec48bb29b1d0b87323484256d23..b56ba35a9a329da1a3da875e5d4d6431ae4f5a89
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -39,11 -31,9 +39,14 @@@ PH
    . Fixed bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756),
      which affected builds against libpq < 7.3. (Adam)
  
+ - Phar:
+   . Fixed bug #67587 (Redirection loop on nginx with FPM). (Christian Weiske)
+ 
 +- SPL:
 +  . Fixed bug #67539 (ArrayIterator use-after-free due to object change during 
 +    sorting). (research at insighti dot org, Laruence)
 +  . Fixed bug #67538 (SPL Iterators use-after-free). (CVE-2014-4670) (Laruence)
 +
  - Streams:
    . Fixed bug #67430 (http:// wrapper doesn't follow 308 redirects). (Adam)
  

diff --cc ext/phar/phar_object.c
Simple merge