From: Adam Harvey <aharvey@php.net>
Date: Tue, 15 Jan 2013 07:24:21 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha4~11^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4191b0aad94fb7bebb8fd5c4233006849845c31;p=php

Merge branch 'PHP-5.3' into PHP-5.4

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

a4191b0aad94fb7bebb8fd5c4233006849845c31
diff --cc NEWS
index 58a50bb944,a7c2fa47e9..14ee211e1b
--- a/NEWS
+++ b/NEWS
@@@ -1,31 -1,10 +1,33 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.3.23
 +?? ??? 2012, PHP 5.4.12
  
 -?? ??? 2013, PHP 5.3.22
 +- 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 #63882 (zend_std_compare_objects crash on recursion). (Dmitry)
++  . Fixed bug #43225 (fputcsv incorrectly handles cells ending in \ followed
++    by "). (Adam)
 +  . Support BITMAPV5HEADER in getimagesize(). (AsamK, Lars)
  
 -- Zend Engine:
 +- 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 #52958 (Segfault in PDO_OCI on cleanup after running a long
 +    testsuite) (hswong3i, Lars)
 +
 +?? ??? 2012, PHP 5.4.11
 +
 +- Core:
    . Fixed bug #63899 (Use after scope error in zend_compile). (Laruence)
    . Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user).
      (Johannes)