0579e8278d
bump year
2015-01-15 23:26:37 +08:00
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
95cef47afb
Porting implementation of RFC json_preserve_fractional_part
2015-01-12 21:29:52 -05:00
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
b68da91d52
Merge branch 'master' into jsond
...
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/config.m4
ext/json/config.w32
ext/json/json.c
ext/json/php_json.h
2014-12-27 19:42:04 +00:00
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
f18aae6042
Fix compilation for json_encoder
2014-11-30 17:47:17 +00:00
a4e59c39a7
Add missing bits to php_json.h
2014-11-25 20:36:41 +00:00
e18dd67975
Move json encoding stuff
2014-11-24 20:46:13 +00:00
fea10f6a5e
ext/iconv, ext/json and ext/session use static tsrmls pointer
2014-10-17 14:16:40 +02:00
016a96c7c2
Fix ::jsonSerialize() failure message
2014-10-12 20:55:51 +02:00
e33f3d3b7c
Move smart_str implementation into Zend/
...
So we can use it there as well...
For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just move that one struct into
zend_types.h.
2014-09-21 20:49:39 +02:00
37aaccad7d
Use inline functions for most of smart_str
...
smart_str_free_ex no longer exists, always use smart_str_free instead.
smart_str_alloc no longer requires a newlen variable to be in scope,
instead it returns the new length.
2014-09-19 23:39:07 +02:00
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
3bc8a958c5
Fixed useless or duplicated IS_INTERNED() checks
2014-09-19 15:41:01 +04:00
232459efd0
fix signature
2014-08-27 22:13:01 +02:00
6db8d4f829
's' works with size_t round 3
2014-08-27 20:49:36 +02:00
3234480827
first show to make 's' work with size_t
2014-08-27 20:49:31 +02:00
37f9f10f01
Improved performance of json_encode()
2014-08-27 13:37:54 +04:00
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
1958857225
ported ext/json
2014-08-19 20:15:59 +02:00
63d3f0b844
basic macro replacements, all at once
2014-08-19 08:07:31 +02:00
543d5eb495
Merge branch 'PHP-5.6'
...
* PHP-5.6:
typofixes
Conflicts:
ext/spl/php_spl.c
2014-08-17 15:53:33 +03:00
56d02d564e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
typofixes
2014-08-17 15:51:15 +03:00
be2128c805
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typofixes
2014-08-17 15:48:22 +03:00
3f42f2f5d1
typofixes
2014-08-17 15:44:02 +03:00
c1965f58d4
Use reference counting instead of zval duplication
2014-06-05 16:04:11 +04:00
b3b616cf7e
Introduced immutable arrays. They don't need to be copyed and may be used directly from SHM.
2014-05-29 18:21:56 +04:00
fa6f6c8807
Fixed Reference handling in xml_parse_into_struct
2014-05-05 19:45:50 +08:00
b30c7fe263
Port JSON
2014-05-05 01:00:59 +02:00
3970b9d7dd
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #66021 (Blank line inside empty array/object)
2014-04-13 18:56:26 -07:00
7c9209a0d1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix #66021 (Blank line inside empty array/object)
2014-04-13 18:56:16 -07:00
9bba219c75
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #66021 (Blank line inside empty array/object)
2014-04-13 18:55:28 -07:00
5e66ce9293
Merge branch 'pull-request/518' into PHP-5.4
...
* pull-request/518:
Fix #66021 (Blank line inside empty array/object)
2014-04-13 18:50:39 -07:00
1ba76df8d0
Export JsonSerializable Interface (bug #65753 )
2014-02-17 10:39:39 +01:00
8a1d248d4e
Export JsonSerializable Interface (bug #65753 )
2014-02-17 10:38:51 +01:00
baafdad150
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Export JsonSerializable Interface (bug #65753 )
2014-02-17 10:36:13 +01:00
786234d351
Export JsonSerializable Interface (bug #65753 )
2014-02-17 10:25:40 +01:00
0f53e37494
Merge branch 'PHP-5.6'
2014-01-03 11:09:07 +08:00
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
a833f7d460
Merge branch 'PHP-5.6'
2013-11-18 12:39:40 +01:00
91779db95b
Fixed case part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
2013-11-11 22:54:16 +00:00
91cb087727
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Update NEWS and remove the unnecessary UPGRADING note.
UPGRADING and NEWS
Better test: Check combined leading/trailing
Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
2013-11-10 16:16:38 -05:00
304bff90f4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update NEWS and remove the unnecessary UPGRADING note.
UPGRADING and NEWS
Better test: Check combined leading/trailing
Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
2013-11-10 16:11:28 -05:00
90d4ae4da8
Make all code paths in json_determine_array_type() return constants.
...
This is a purely cosmetic change, but the current behaviour of returning
PHP_JSON_OUTPUT_ARRAY and 1 looks weird.
2013-11-09 12:15:37 -05:00
82a4f1a1a2
Fix #66021 (Blank line inside empty array/object)
...
Changed json_encode() so that when the JSON_PRETTY_PRINT option is specified,
the pair of linefeeds immediately after an opening bracket and before the
corresponding closing bracket is omitted when the array or object contains no
elements or accessible properties (and hence would have a blank line between
the brackets).
2013-11-02 15:59:11 -04:00
2524428504
Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
2013-09-17 19:09:52 +00:00
4749457a49
HASH_KEY_NON_EXISTANT fix
2013-07-21 20:09:53 -07:00
Xinchen Hui