From: Christopher Jones <sixd@php.net>
Date: Thu, 22 Mar 2012 18:34:25 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' of /home/cjones/php-src into PHP-5.4
X-Git-Tag: php-5.4.1RC1~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=22f4043a3813c9fbebe37bff2e876f2b85de01f0;p=php

Merge branch 'PHP-5.4' of /home/cjones/php-src into PHP-5.4

* 'PHP-5.4' of /home/cjones/php-src: (21 commits)
  Fixed bug #61423 (gzip compression fails).
  BFN
  Fixed bug #61423 (gzip compression fails).
  Revert "Fixed reference counting"
  Revert "Fixed reference counting"
  Revert "Fixed reference counting"
  Fixed reference counting
  Fixed reference counting
  Fix test, and merge the modification from trunk
  Ignore the tempoary files
  Fix test, which was broken by the fix for #61173
  Use the NEWS merge driver if available
  Made some SplFileObject::fputcsv not pollute the working dir.
  Fixed bug #61453.
  Fixed bug #49853 (Soap Client stream context header option ignored)
  Always keep the NEWS file from the branch when merging
  Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831)
  - update NEWS
  - add test for bug #55000 and #54374
  - merge fix bug #54374, bug #55500 - filter file names better, no dangling [s, svn revision 321664
  ...
---

22f4043a3813c9fbebe37bff2e876f2b85de01f0