com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS ext/iconv/iconv.c
| From: | Stanislav Malyshev | Date: | Sun, 10 May 2015 01:57:18 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS ext/iconv/iconv.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86658@lists.php.net to get a copy of this message | ||
Commit: 33594b78ec533127282a542d1e78b62df9e2dd4f
Author: Stanislav Malyshev <stas@php.net> Sat, 9 May 2015 18:56:25 -0700
Parents: 329513c3a75c5aba7a7f04cd21325132f7104d06 473ec539a1c3d242c8b171dd6a5a98fa17e05c13
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=33594b78ec533127282a542d1e78b62df9e2dd4f
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix #48147 - implement manual handling of //IGNORE for broken libc
Bugs:
https://bugs.php.net/48147
Changed paths:
MM NEWS
MM ext/iconv/iconv.c
Diff:
diff --cc NEWS
index 373098d,9f843c7..526d580
--- 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,