delta/php-git.git/ext/json, 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 






Fix 73113 - Segfault with throwing JsonSerializable
2016-09-19T13:16:14+00:00

Julien Pauli
jpauli@php.net

2016-09-19T13:01:54+00:00

b41abf7496039b24a9a6e0838350870fdc1d9367












Bump PHP_JSON_VERSION to 1.5.0
2016-08-29T14:18:00+00:00

Jakub Zelenka
bukka@php.net

2016-08-29T14:18:00+00:00

c4961fa8b637cd4b6e20ffa34a94cbaf60363fd8












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












Fix recursion and protection in the failed JSON encoding
2016-08-29T13:49:40+00:00

Jakub Zelenka
bukka@php.net

2016-08-28T11:53:11+00:00

df05dbb3dfa0b55b25ff499c7e1646928279952d












Add initial failure checking for json_encode
2016-08-29T13:49:40+00:00

Jakub Zelenka
bukka@php.net

2016-08-24T19:46:33+00:00

12a8c3f6e79ff159cce455ff9944a03aa70ff589












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