com php-src: Update NEWS and UPGRADING for PR #1701: NEWS UPGRADING

Commit: 1091cec28fd49a8ca5e3902266626739918b1f56 Author: Jakub Zelenka <bukka@php.net> Fri, 22 Jan 2016 19:39:16 +0000 Parents: 104876dd8e3ddb5cb46971a8e1be100ba7d9b432 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1091cec28fd49a8ca5e3902266626739918b1f56 Log: Update NEWS and UPGRADING for PR #1701 Bugs: https://bugs.php.net/1701 Changed paths: M NEWS M UPGRADING Diff: diff --git a/NEWS b/NEWS index 808424f..46b2143 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,11 @@ PHP NEWS - Hash: . Added SHA3 fixed mode algorithms (224, 256, 384, and 512 bit). (Sara) +- JSON: + . Escaped U+2028 and U+2029 when JSON_UNESCAPED_UNICODE is supplied as + json_encode options and added JSON_UNESCAPED_LINE_TERMINATORS to restore + the previous behaviour. (Eddie Kohler) + - PDO_Firebird: . Fixed bug #60052 (Integer returned as a 64bit integer on X86_64). (Mariuz) diff --git a/UPGRADING b/UPGRADING index 344c221..8208adb 100644 --- a/UPGRADING +++ b/UPGRADING @@ -22,6 +22,10 @@ PHP 7.1 UPGRADE NOTES . 'void' can no longer be used as the name of a class, interface, or trait. This applies to declarations, class_alias() and use statements. +- JSON: + . When calling json_encode with JSON_UNESCAPED_UNICODE option, U+2028 and + U+2029 are escaped. + ======================================== 2. New Features ======================================== @@ -45,6 +49,9 @@ PHP 7.1 UPGRADE NOTES - The first $varname argument for getenv() is no longer mandatory, the current environment variables will be returned as an associative array when omitted. +- json_encode() accepts new option JSON_UNESCAPED_LINE_TERMINATORS that + disables escaping of U+2028 and U+2029 characters when + JSON_UNESCAPED_UNICODE is supplied. - long2ip() accepts integer as parameter now - pg_last_notice() accepts optional long parameter to specify operation. PGSQL_NOTICE_LAST - Get last notice (Default) @@ -79,6 +86,9 @@ PHP 7.1 UPGRADE NOTES 10. New Global Constants ======================================== +- JSON: + . JSON_UNESCAPED_LINE_TERMINATORS + - Pgsql: PGSQL_NOTICE_LAST PGSQL_NOTICE_ALL