Anatol Belski
fdaa540fd8
Sync with e0fe6674
2018-08-13 09:18:38 +02:00
Cristian Rodríguez
e0fe667421
Fix bug #76030 RE2C_FLAGS rarely honoured
...
Since PHP 5.3 the default lexer generator is RE2C. On Unix-alike build
systems there is also optional configure option --enable-re2c-cgoto
which enables optimized conditional jumps using non-standard computed
goto extension. It is available since RE2C 0.10.3 so it's well covered
by RE2C versions PHP uses. This patch syncs usage of -g option accross
the PHP Unix-alike build system.
2018-08-12 11:15:18 +02:00
Gabriel Caruso
9c8b3ae43f
Make more tests run on 64bit plataforms
2018-07-30 09:43:09 -03:00
Dmitry Stogov
a29a800cb0
Regenerate scanners using re2c version >= 1.0.0 (newer version, at least, produce less code)
2018-07-25 12:49:03 +03:00
Peter Kokot
8d3f8ca12a
Remove unused Git attributes ident
...
The $Id$ keywords were used in Subversion where they can be substituted
with filename, last revision number change, last changed date, and last
user who changed it.
In Git this functionality is different and can be done with Git attribute
ident. These need to be defined manually for each file in the
.gitattributes file and are afterwards replaced with 40-character
hexadecimal blob object name which is based only on the particular file
contents.
This patch simplifies handling of $Id$ keywords by removing them since
they are not used anymore.
2018-07-25 00:53:25 +02:00
Xinchen Hui
e3355ac5ec
Revert "Rename _zval_dtor_func to _ref_dtor_func"
...
This reverts commit a362ae6b12
2018-07-06 18:37:45 +08:00
Xinchen Hui
a362ae6b12
Rename _zval_dtor_func to _ref_dtor_func
2018-07-06 18:32:27 +08:00
Dmitry Stogov
918a9f09f8
Use zval_ptr_dtor_nogc() in JSON parser (it can't produce circular data structures)
2018-07-05 15:07:16 +03:00
Jakub Zelenka
f3ef13e1d6
Bump PHP_JSON_VERSION to 1.7.0
2018-06-14 20:25:59 +01:00
Dmitry Stogov
c1ce43d1d2
php_json_escape_string() optimization
2018-06-13 18:26:48 +03:00
Dmitry Stogov
d90c6f2443
Removed useless zval_ptr_dtor()
2018-05-29 17:58:06 +03:00
Dmitry Stogov
5eb1f92f31
Use zend_string_release_ex() instread of zend_string_release() in places, where we sure about string persistence.
2018-05-28 16:27:12 +03:00
Dmitry Stogov
4ad9cf4605
Bit test optimization
2018-05-08 11:58:17 +03:00
Dmitry Stogov
c88be6aee1
Bit check micro-optimization
2018-04-28 14:13:12 +03:00
Gabriel Caruso
1314f0fb3a
Use int instead of long in protos
2018-02-23 11:06:20 +01:00
Gabriel Caruso
ded3d984c6
Use EXPECT instead of EXPECTF when possible
...
EXPECTF logic in run-tests.php is considerable, so let's avoid it.
2018-02-20 21:53:48 +01:00
Gabriel Caruso
c6c9e71a5b
Add missing SKIPIF sections
2018-02-03 13:54:34 +01:00
Nat Zimmermann
2d1ec6f4b5
Add tests for json_decode with depth below 0
2018-01-24 21:23:24 +01:00
Gabriel Caruso
6400264856
Trailing whitespaces
...
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
2018-01-03 14:38:00 +01:00
Xinchen Hui
a6519d0514
year++
2018-01-02 12:57:58 +08:00
Jakub Zelenka
ba85001439
Merge branch 'PHP-7.2'
2017-12-30 17:44:09 +00:00
Jakub Zelenka
84aad458ca
Merge branch 'PHP-7.1' into PHP-7.2
2017-12-30 17:41:45 +00:00
Jakub Zelenka
2fd0b994dd
Use seialize_precision instead of precision in all json tests
2017-12-30 17:34:01 +00:00
Xinchen Hui
d56a534acc
RC manipulation cleanup 2
2017-11-02 12:13:35 +08:00
Andrea Faulds
e823770515
Merge JSON_THROW_ON_ERROR
2017-10-22 19:41:23 +01:00
Jakub Zelenka
d1f5811ff0
Merge branch 'PHP-7.2'
2017-10-15 19:37:22 +01:00
Jakub Zelenka
7c556c44a1
Fix bug #68567 (JSON_PARTIAL_OUTPUT_ON_ERROR can result in JSON with null key)
2017-10-15 19:36:15 +01:00
Xinchen Hui
bc038206ad
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Prevent from being affected by local php.ini
Added skipf
2017-10-13 18:24:27 +08:00
Xinchen Hui
21f049b45c
Prevent from being affected by local php.ini
2017-10-13 18:23:56 +08:00
Dmitry Stogov
cb9d81ef4f
Refactored recursion pretection
2017-10-06 01:34:50 +03:00
Anatol Belski
3b2e8f8f70
Sync json parser defs
2017-09-20 15:08:45 +02:00
Dmitry Stogov
44e0b79ac6
Refactored array creation API. array_init() and array_init_size() are converted into macros calling zend_new_array(). They are not functions anymore and don't return any values.
2017-09-20 02:25:56 +03:00
Jakub Zelenka
e53dd027c5
Reset utf8_invalid in json scanner
2017-08-10 19:47:58 +01:00
Jakub Zelenka
f5b4cb7130
Fix possible overflow in json scanner utf8_invalid_count
2017-08-10 19:40:02 +01:00
Darek Slusarczyk
abd97b8bcb
Merge branch 'PHP-7.1' into PHP-7.2
...
# Conflicts:
# ext/json/config.w32
2017-08-08 16:08:19 +02:00
Darek Slusarczyk
86aa1ca990
Merge branch 'PHP-7.0' into PHP-7.1
2017-08-08 16:05:13 +02:00
Darek Slusarczyk
618dcd6520
JSON: fix config.w32 / Install headers on windows
2017-08-08 15:52:53 +02:00
Jakub Zelenka
41d7621f48
Fix segfault in json ignoring of invalid UTF8
2017-08-06 17:20:31 +01:00
Jakub Zelenka
18180bb161
Bump PHP_JSON_VERSION to 1.6.0
2017-07-16 15:53:02 +01:00
Jakub Zelenka
0f047f60f0
[ci skip] Remove CSV leftovers from json code - $Id$
2017-07-16 15:51:39 +01:00
Jakub Zelenka
9c58822653
Introduce internal php_json_encode_ex to allow extensions setting depth
2017-07-16 15:47:23 +01:00
Jakub Zelenka
0d0f7cde8c
Add JSON_INVALID_UTF8_SUBSTITUTE and JSON_INVALID_UTF8_IGNORE
...
It implements request #65082 and adds options for replacing resp.
ignoring invalid UTF-8 sequences for json_encode and json_decode.
2017-07-16 12:35:24 +01:00
Dmitry Stogov
9c2a1f52a5
Avoid useless dereferences and separations during paramter passing.
2017-06-19 12:55:59 +03:00
Dmitry Stogov
6fe75aad6d
Optimization for fast path.
2017-06-19 10:07:11 +03:00
Jakub Zelenka
bfa9362d43
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-18 18:28:54 +01:00
Jakub Zelenka
887fabe78f
Regenerate and bump re2c version to 0.16
...
It also matches the re2c version for Zend language scanner
2017-06-18 18:26:48 +01:00
Jakub Zelenka
8ec45be8db
Merge branch 'PHP-7.1'
2017-06-18 18:32:19 +01:00
Dmitry Stogov
1385784f54
Fixed performance degradaton introduced in f6ac96b
2017-06-13 12:20:14 +03:00
Jakub Zelenka
f6ac96b039
Improve and simplify UTF-8 validation in JSON
2017-06-11 17:27:32 +01:00
Dmitry Stogov
13ee8fd626
Improved UTF-8 validation in JSON
2017-05-25 01:16:17 +03:00
