Sammy Kaye Powers
dac6c639bb
Update copyright headers to 2017
2017-01-04 11:23:42 -06:00
Johannes Schlüter
54f526be89
Install ext/json headers
2016-12-07 17:50:05 +01:00
Anatol Belski
d61db8d602
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
remove TSRMLS_*
2016-11-22 00:32:42 +01:00
Anatol Belski
5e9b4c26a5
remove TSRMLS_*
2016-11-21 23:53:37 +01:00
Jakub Zelenka
f284479734
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-20 20:38:34 +00:00
Jakub Zelenka
60574ea1ac
Fix bug #73526 (php_json_encode depth issue)
2016-11-20 20:36:03 +00:00
Jakub Zelenka
c34de0b61c
Introduce json encoder to fix globals related issues
...
It fixes bugs #66025 and #73254 by replacing globals with
a passed structure holding depth and error code. In addition
it fixes #72069 in a more generic way.
2016-10-30 13:20:10 +00:00
Dmitry Stogov
9ded1b4edb
Introduced HT_IS_PACKED() and HT_IS_WITHOUT_HOLES() macros. (Benjamin Coutu)
2016-10-19 23:10:42 +03:00
Julien Pauli
7c7dc62c11
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Do not wrap user exception in case of custom JSON serialization
Conflicts:
ext/json/json_encoder.c
2016-09-19 16:42:53 +02:00
Julien Pauli
c4f3ea10e4
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Do not wrap user exception in case of custom JSON serialization
Conflicts:
ext/json/json.c
2016-09-19 16:11:17 +02:00
Julien Pauli
1ed4b13fb6
Do not wrap user exception in case of custom JSON serialization
2016-09-19 16:06:12 +02:00
Julien Pauli
b41abf7496
Fix 73113 - Segfault with throwing JsonSerializable
2016-09-19 15:16:14 +02:00
Jakub Zelenka
c4961fa8b6
Bump PHP_JSON_VERSION to 1.5.0
2016-08-29 15:18:00 +01:00
Jakub Zelenka
27acbcf4df
Add test for fixed bug #68992
2016-08-29 14:49:40 +01:00
Jakub Zelenka
df05dbb3df
Fix recursion and protection in the failed JSON encoding
2016-08-29 14:49:40 +01:00
Jakub Zelenka
12a8c3f6e7
Add initial failure checking for json_encode
2016-08-29 14:49:40 +01:00
Jakub Zelenka
37c12f8f86
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-14 14:01:36 +01:00
Jakub Zelenka
436d50a821
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-14 14:00:35 +01:00
Jakub Zelenka
9f1d962ed6
Fixed bug #72787 (json_decode reads out of bounds)
2016-08-14 13:52:59 +01:00
Jakub Zelenka
bea131f0bc
Add return code from json API functions
...
It will allow fix few json bugs in a better way
2016-06-28 20:49:38 +01:00
Jakub Zelenka
3f13507dd2
Use one place to define max length of double
...
Introduce new constant PHP_DOUBLE_MAX_LENGTH for that purpose
2016-06-26 14:03:01 +01:00
Jakub Zelenka
75b86a2c22
Replace json.precision with serialize_precision
2016-06-26 13:26:43 +01:00
Yasuo Ohgaki
5f5dc04fc2
Add cast
2016-06-26 13:26:43 +01:00
Yasuo Ohgaki
e3d9f1f4d8
Simply use ndigit for flag for zend_dtoa mode
2016-06-26 13:26:43 +01:00
Yasuo Ohgaki
3aa2aadcf0
Add JSON_G(precision)
2016-06-26 13:26:43 +01:00
Yasuo Ohgaki
f943daf2d7
Initial patch for 0 mode float conversion. The magic number is better to be improved. Any suggestion where to define it?
2016-06-26 13:26:42 +01:00
Dmitry Stogov
ffef14a0a1
Fixed test according to FR #46600 ("_empty_" key in objects)
2016-06-22 00:56:56 +03:00
Dmitry Stogov
323b2733f6
Fixed compilation warnings
2016-06-22 00:40:50 +03:00
Jakub Zelenka
f0d1cca672
Use empty keys instead of _empty_ in json decoding
2016-06-20 19:44:00 +01:00
Jakub Zelenka
0a0e42d1f5
Add php_json_yyparse for direct use in json ext
2016-05-11 21:11:47 +01:00
Jakub Zelenka
b91c05ea14
Fix and clean up exporting of json parser
2016-05-11 20:54:42 +01:00
Xinchen Hui
197470b62f
Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)"
...
This reverts commit 459a7cc209
.
2016-05-06 20:25:24 +08:00
Xinchen Hui
459a7cc209
Fixed bug #72170 (JsonSerializable may inc apply count without dec it)
...
I don't want use zend_try here, but seems I have no choice :<
2016-05-06 18:38:26 +08:00
Jakub Zelenka
afb4062c2c
Merge branch 'json_parser_method' into json_parser_method_embed
2016-05-03 19:55:55 +01:00
Jakub Zelenka
34a9882ad3
Merge branch 'master' into json_parser_method
2016-05-03 19:55:41 +01:00
Jakub Zelenka
37048c0f6c
Use embedded json parser method structure
2016-05-02 13:02:40 +01:00
Xinchen Hui
fa5f28a0a1
Merge branch 'PHP-7.0'
2016-04-22 21:41:52 -07:00
Xinchen Hui
589d0e0f18
Fixed bug #72069 (Behavior \JsonSerializable different from json_encode)
2016-04-22 21:41:44 -07:00
Jakub Zelenka
93b67dd511
Remove json parser depth methods and tidy it up
2016-04-10 16:10:26 +01:00
Jakub Zelenka
72ccfda25a
Add method hooking support to json parser
...
This commit is just a slight modification (renaming and some small
changes) of the patch that has been provided by Andrey Hristov.
It adds support for hooking of the json parser operations and
allows re-using of modified JSON parsing outside of json ext.
2016-04-10 15:35:41 +01:00
Xinchen Hui
3f3180e35f
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Update test script
2016-03-22 11:28:45 +08:00
Xinchen Hui
b49ec68134
Update test script
2016-03-22 11:28:19 +08:00
Xinchen Hui
1e5ac8940a
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)
2016-03-21 16:22:02 +08:00
Jakub Zelenka
7e069daa89
Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)
2016-03-20 15:56:27 +00:00
Nikita Popov
f57c0b3249
Merge branch 'PHP-7.0'
2016-03-03 16:50:47 +01:00
Nikita Popov
1ac152938c
Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE
...
Also re bug #71575 .
2016-03-03 16:50:01 +01:00
James Titcumb
c4b188871e
Fix bug #71575 removing extra semicolons outside macros
2016-03-03 16:41:03 +01:00
Eddie Kohler
104876dd8e
json_encode: Escape U+2028 and U+2029 more often.
...
These characters are illegal in Javascript, so leaving them unescaped
is risky. The default encoder ($flags = 0) is fine, but the encoder
with JSON_UNESCAPED_UNICODE flag is not.
In case anyone wants the ability to leave these characters unescaped,
provide JSON_UNESCAPED_LINE_TERMINATORS.
2016-01-22 19:40:58 +00:00
Lior Kaplan
2eb1f38d24
Happy new year (Update copyright to 2016)
2016-01-01 20:03:16 +02:00
Lior Kaplan
ed35de784f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00