From 539fd6591591c78692848387210dcabb76b163f8 Mon Sep 17 00:00:00 2001 From: Yasuo Ohgaki Date: Tue, 3 Feb 2015 19:45:20 +0900 Subject: Update NEWS --- NEWS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS b/NEWS index cccb8c1694..d2b70a77c1 100644 --- a/NEWS +++ b/NEWS @@ -43,6 +43,9 @@ PHP NEWS - Phar: . Fixed bug #68901 (use after free). (bugreports at internot dot info) +- Pgsql: + . Fixed Bug #65199 'pg_copy_from() modifies input array variable). (Yasuo) + - Sqlite3: . Fixed bug #68260 (SQLite3Result::fetchArray declares wrong required_num_args). (Julien) @@ -55,6 +58,8 @@ PHP NEWS - Session: . Fixed bug #68941 (mod_files.sh is a bash-script) (bugzilla at ii.nl, Yasuo) + . Fixed Bug #66623 (no EINTR check on flock) (Yasuo) + . Fixed bug #68063 (Empty session IDs do still start sessions) (Yasuo) - Standard: . Fixed bug #65272 (flock() out parameter not set correctly in windows). -- cgit v1.2.1 From c85f12e3aca8d1da64504018e421a766ab66e574 Mon Sep 17 00:00:00 2001 From: Julien Pauli Date: Wed, 4 Feb 2015 12:48:17 +0100 Subject: Revert "json_decode() should generate a syntax error when given ""." This reverts commit a7b3abe4e6f5e2fdfd8d55b676c9ca6b3f9c8cc8. --- ext/json/json.c | 1 - ext/json/tests/bug54484.phpt | 9 ++------- ext/json/tests/bug68938.phpt | 11 ----------- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 ext/json/tests/bug68938.phpt diff --git a/ext/json/json.c b/ext/json/json.c index 27aed969d9..5b71eb06f6 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -818,7 +818,6 @@ static PHP_FUNCTION(json_decode) JSON_G(error_code) = 0; if (!str_len) { - JSON_G(error_code) = PHP_JSON_ERROR_SYNTAX; RETURN_NULL(); } diff --git a/ext/json/tests/bug54484.phpt b/ext/json/tests/bug54484.phpt index e56d8bd86b..d698ab5416 100644 --- a/ext/json/tests/bug54484.phpt +++ b/ext/json/tests/bug54484.phpt @@ -15,16 +15,11 @@ json_decode("invalid json"); var_dump(json_last_error()); -json_decode("\001 invalid json"); -var_dump(json_last_error()); - - json_decode(""); var_dump(json_last_error()); ?> --EXPECT-- int(0) +int(0) int(4) -int(4) -int(3) -int(4) +int(0) diff --git a/ext/json/tests/bug68938.phpt b/ext/json/tests/bug68938.phpt deleted file mode 100644 index f6291ffe62..0000000000 --- a/ext/json/tests/bug68938.phpt +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Bug #68938 (json_decode() decodes empty string without indicating error) ---SKIPIF-- - ---FILE-- - ---EXPECT-- -int(4) -- cgit v1.2.1