Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Revert "Update fputcsv() to escape all characters equally."

diff --cc NEWS
index 5f4566757619694920ff87e2748ff1603ceb1304,e78af2339d82cd3fcdcc45ad6e16b6e1ea42860d..8201ce1b4c5121db5435decdc1d92f1a33ee33f8
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,58 -1,17 +1,56 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.3.23
 +?? ??? 2012, PHP 5.4.12
  
 -?? ??? 2013, PHP 5.3.22
 -
 -- Zend Engine:
 +- Core:
 +  . Fixed bug #63982 (isset() inconsistently produces a fatal error on
 +    protected property). (Stas)
 +  . Fixed bug #63943 (Bad warning text from strpos() on empty needle).
 +    (Laruence)
    . Fixed bug #63899 (Use after scope error in zend_compile). (Laruence)
-   . Fixed bug #43225 (fputcsv incorrectly handles cells ending in \ followed
-     by "). (Adam)
 +  . Fixed bug #63882 (zend_std_compare_objects crash on recursion). (Dmitry)
 +  . Support BITMAPV5HEADER in getimagesize(). (AsamK, Lars)
 +
 +- Date:
 +  . Fixed bug #63699 (Performance improvements for various ext/date functions).
 +    (Lars, original patch by njaguar at gmail dot com)
 +  . Fixed bug #55397: Comparsion of incomplete DateTime causes SIGSEGV. 
 +    (Derick)
 +
 +- Litespeed:
 +  . Fixed bug #63228 (-Werror=format-security error in lsapi code). (George)
 +
 +- ext/sqlite3:
 +  . Fixed bug #63921 (sqlite3::bindvalue and relative PHP functions aren't
 +    using sqlite3_*_int64 API). (srgoogleguy, Lars)
 +
 +- PDO_sqlite:
 +  . Fixed bug #63916 (PDO::PARAM_INT casts to 32bit int internally even
 +    on 64bit builds in pdo_sqlite). (srgoogleguy, Lars)
 +  . Fixed bug #57702 (Multi-row BLOB fetches). (hswong3i, Laruence)
 +  . Fixed bug #52958 (Segfault in PDO_OCI on cleanup after running a long
 +    testsuite). (hswong3i, Lars)
 +
 +?? ??? 2012, PHP 5.4.11
 +
 +- Core:
    . Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user).
      (Johannes)
 +  . Fixed bug #43177 (Errors in eval()'ed code produce status code 500).
 +    (Todd Ruth, Stas).
  
 -- Core
 -  . Fixed bug #63943 (Bad warning text from strpos() on empty needle).
 -    (Laruence)
 +- Filter:
 +  . Fixed bug #63757 (getenv() produces memory leak with CGI SAPI). (Dmitry)
 +  . Fixed bug #54096 (FILTER_VALIDATE_INT does not accept +0 and -0).
 +    (martin at divbyzero dot net, Lars)
 +
 +- JSON:
 +  . Fixed bug #63737 (json_decode does not properly decode with options
 +    parameter). (Adam)
 +
 +- CLI server
 +  . Update list of common mime types. Added webm, ogv, ogg. (Lars,
 +    pascalc at gmail dot com)
  
  - cURL extension:
    . Fixed bug (segfault due to libcurl connection caching). (Pierrick)

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