From: Stanislav Malyshev <stas@php.net>
Date: Sun, 10 May 2015 01:56:25 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.10RC1~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33594b78ec533127282a542d1e78b62df9e2dd4f;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix #48147 - implement manual handling of  //IGNORE for broken libc
---

33594b78ec533127282a542d1e78b62df9e2dd4f
diff --cc NEWS
index 373098ded3,9f843c718c..526d5801b0
--- a/NEWS
+++ b/NEWS
@@@ -17,12 -26,10 +17,15 @@@ PH
    . Fixed bug #68652 (segmentation fault in destructor). (Dmitry)
    . Fixed bug #69419 (Returning compatible sub generator produces a warning).
      (Nikita)
 -  . Fixed bug #69472 (php_sys_readlink ignores misc errors from 
 -    GetFinalPathNameByHandleA). (Jan Starke)
 +  . Fixed bug #69472 (php_sys_readlink ignores misc errors from
 +       GetFinalPathNameByHandleA). (Jan Starke)
 +
++- Iconv:
++  . Fixed bug #48147 (iconv with //IGNORE cuts the string). (Stas)
+ 
  - ODBC:
 +  . Fixed bug #69354 (Incorrect use of SQLColAttributes with ODBC 3.0).
 +    (Anatol)
    . Fixed bug #69474 (ODBC: Query with same field name from two tables returns
      incorrect result). (Anatol)
    . Fixed bug #69381 (out of memory with sage odbc driver). (Frederic Marchall,