delta/php-git.git/ext/json/tests, branch microseconds git.php.net: repository/php-src.git Merge branch 'PHP-7.0' into PHP-7.1 2016-09-19T14:42:53+00:00 Julien Pauli jpauli@php.net 2016-09-19T14:12:33+00:00 7c7dc62c11da6e1e10452f96c1c8b823e5bb468c * PHP-7.0: Do not wrap user exception in case of custom JSON serialization Conflicts: ext/json/json_encoder.c 
* PHP-7.0:
  Do not wrap user exception in case of custom JSON serialization

Conflicts:
	ext/json/json_encoder.c
Merge branch 'PHP-5.6' into PHP-7.0 2016-09-19T14:11:17+00:00 Julien Pauli jpauli@php.net 2016-09-19T14:08:37+00:00 c4f3ea10e49a2a44e767ce38c57329934a6bbaba * PHP-5.6: Do not wrap user exception in case of custom JSON serialization Conflicts: ext/json/json.c 
* PHP-5.6:
  Do not wrap user exception in case of custom JSON serialization

Conflicts:
	ext/json/json.c
Do not wrap user exception in case of custom JSON serialization 2016-09-19T14:06:12+00:00 Julien Pauli jpauli@php.net 2016-09-19T14:06:12+00:00 1ed4b13fb62eafc53fca06c1929613c334b51edb 






Add test for fixed bug #68992
2016-08-29T13:49:40+00:00

Jakub Zelenka
bukka@php.net

2016-08-28T12:00:49+00:00

27acbcf4df1ddac593f37fc4f9bb30fdfb456377












Merge branch 'PHP-7.0' into PHP-7.1
2016-08-14T13:01:36+00:00

Jakub Zelenka
bukka@php.net

2016-08-14T13:01:36+00:00

37c12f8f867ad96e005cefc545093e43b633728c












Merge branch 'PHP-5.6' into PHP-7.0
2016-08-14T13:00:35+00:00

Jakub Zelenka
bukka@php.net

2016-08-14T13:00:35+00:00

436d50a82192cbef4431fe9a70c641f49aec55a8












Fixed bug #72787 (json_decode reads out of bounds)
2016-08-14T12:52:59+00:00

Jakub Zelenka
bukka@php.net

2016-08-14T12:52:59+00:00

9f1d962ed6057a3996f1b5aa82467a3172e41e8f












Fixed test according to FR #46600 ("_empty_" key in objects)
2016-06-21T21:56:56+00:00

Dmitry Stogov
dmitry@zend.com

2016-06-21T21:56:56+00:00

ffef14a0a1c42119131c51b58fb8252422e55f26












Use empty keys instead of _empty_ in json decoding
2016-06-20T18:44:00+00:00

Jakub Zelenka
bukka@php.net

2016-05-29T19:15:16+00:00

f0d1cca6729f2593900af10d6aa324b7eedfe0c3












Merge branch 'PHP-7.0'
2016-05-06T12:25:43+00:00

Xinchen Hui
laruence@gmail.com

2016-05-06T12:25:43+00:00

ed0eb2bfddfd17d63828b4b0e8ba0ca6e4d70a89

* PHP-7.0:
  Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)"





* PHP-7.0:
  Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)"