Ilija Tovilo
ac41608797
Fix -Wenum-int-mismatch warning in ext/json/php_json_encoder.h
2023-05-14 22:10:23 +02:00
Jakub Zelenka
90553af15c
Merge branch 'PHP-8.1' into PHP-8.2
2023-05-13 18:53:35 +01:00
Jakub Zelenka
e8a836eb39
Expose JSON internal function to escape string
2023-05-13 18:41:33 +01:00
George Peter Banyard
ec53e17adf
Use more appropriate types in JSON extension ( #8194 )
...
Mainly zend_result
2022-03-16 22:53:41 +00:00
KsaR
01b3fc03c3
Update http->https in license ( #6945 )
...
1. Update: http://www.php.net/license/3_01.txt to https, as there is anyway server header "Location:" to https.
2. Update few license 3.0 to 3.01 as 3.0 states "php 5.1.1, 4.1.1, and earlier".
3. In some license comments is "at through the world-wide-web" while most is without "at", so deleted.
4. fixed indentation in some files before |
2021-05-06 12:16:35 +02:00
Gabriel Caruso
5d6e923d46
Remove mention of PHP major version in Copyright headers
...
Closes GH-4732.
2019-09-25 14:51:43 +02:00
Zeev Suraski
38c337f22e
Remove year range from copyright notice
2019-01-30 11:00:23 +02:00
Xinchen Hui
a6519d0514
year++
2018-01-02 12:57:58 +08:00
Sammy Kaye Powers
9e29f841ce
Update copyright headers to 2017
2017-01-02 09:30:12 -06: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
Jakub Zelenka
12a8c3f6e7
Add initial failure checking for json_encode
2016-08-29 14:49:40 +01:00
Lior Kaplan
2eb1f38d24
Happy new year (Update copyright to 2016)
2016-01-01 20:03:16 +02:00
Lior Kaplan
a4384bd3d4
s/PHP Version 5/PHP Version 7/g
...
Follow up for d0cb7153
2015-03-13 11:09:42 +02:00
Jakub Zelenka
3159d518d0
Merge branch 'master' into jsond
...
Conflicts:
ext/json/JSON_parser.c
ext/json/json.c
2015-01-25 18:43:15 +00:00
Jakub Zelenka
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
Jakub Zelenka
e18dd67975
Move json encoding stuff
2014-11-24 20:46:13 +00:00
