Merge branch 'PHP-5.5' into PHP-5.6

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

diff --cc NEWS
index 373098ded3ea83ab91a807744c205b5ce8e9202a,9f843c718c5ce2354952e3814e27bd5a2691de12..526d5801b057616f8e90d205bb32e1d2c03be508
--- 1/NEWS
--- 2/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,

diff --cc ext/iconv/iconv.c
Simple merge