delta/php-git.git/ext/json, branch php-7.0.11 git.php.net: repository/php-src.git 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












Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)"
2016-05-06T12:25:24+00:00

Xinchen Hui
laruence@gmail.com

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

197470b62f8256898adfe758302cb0241195c480

This reverts commit 459a7cc209da130256d66c1f896199540f4dadbc.





This reverts commit 459a7cc209da130256d66c1f896199540f4dadbc.







Fixed bug #72170 (JsonSerializable may inc apply count without dec it)
2016-05-06T10:38:26+00:00

Xinchen Hui
laruence@gmail.com

2016-05-06T10:38:26+00:00

459a7cc209da130256d66c1f896199540f4dadbc

I don't want use zend_try here, but seems I have no choice :<





I don't want use zend_try here, but seems I have no choice :<







Fixed bug #72069 (Behavior \JsonSerializable different from json_encode)
2016-04-23T04:41:44+00:00

Xinchen Hui
laruence@gmail.com

2016-04-23T04:41:44+00:00

589d0e0f187ff82f90110057f624c958f0d3ec86












Update test script
2016-03-22T03:28:19+00:00

Xinchen Hui
laruence@gmail.com

2016-03-22T03:28:19+00:00

b49ec68134688edff0ae095dd09656dd3430f527












Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)
2016-03-20T15:56:27+00:00

Jakub Zelenka
bukka@php.net

2016-03-20T15:53:57+00:00

7e069daa89f05c1fa4127b2cedfd5586dbfc810e












Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE
2016-03-03T15:50:01+00:00

Nikita Popov
nikic@php.net

2016-03-03T15:46:04+00:00

1ac152938cfe40e98b7b3c8cf403abb113266cfa

Also re bug #71575.





Also re bug #71575.







Fix bug #71575 removing extra semicolons outside macros
2016-03-03T15:41:03+00:00

James Titcumb
james@asgrim.com

2016-02-16T22:47:37+00:00

c4b188871e7abb7c6cc20d05ceda4cea082efcd2












Happy new year (Update copyright to 2016)
2016-01-01T18:03:16+00:00

Lior Kaplan
kaplanlior@gmail.com

2016-01-01T17:49:07+00:00

2eb1f38d24bcd02f69bfcf7845f93563a42850d6