archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
135288 commits 526 branches 1434 tags 873 MiB
Commit graph

567 commits

Author SHA1 Message Date
Anatol Belski
12fff5251b fix inconsistend dll linkage warn 2015-02-09 10:51:29 +01:00
Anatol Belski
fc5b349789 size_t vs int 2015-02-09 10:47:39 +01:00
Anatol Belski
a1208b4726 use size_t for str length 2015-02-09 10:43:27 +01:00
Anatol Belski
6747c166d8 generate missing json files from config.w32 2015-02-09 10:12:26 +01:00
Jakub Zelenka
f2825042b4 Merge branch 'master' into jsond 
Conflicts:
	ext/json/json.c
 2015-02-08 14:08:31 +00:00
Julien Pauli
93315c4e1d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Revert "json_decode() should generate a syntax error when given ""."
  Update NEWS
 2015-02-04 12:48:57 +01:00
Julien Pauli
c85f12e3ac Revert "json_decode() should generate a syntax error when given ""." 
This reverts commit a7b3abe4e6.
 2015-02-04 12:48:17 +01:00
Dmitry Stogov
2428fd1c8b Use object pointers instead of handles 2015-02-04 12:01:55 +03:00
Jakub Zelenka
c3cd2d33ca Fix invalid test for bug 54484 2015-02-02 20:53:27 +00:00
Jakub Zelenka
fdc14c64be Add re2c sources 2015-02-02 19:55:29 +00:00
Jakub Zelenka
3e4c1717ee Merge branch 'master' into jsond 2015-02-02 19:53:32 +00:00
Jakub Zelenka
20bae2a503 Give me credit 2015-02-02 19:33:48 +00:00
Adam Harvey
9e20b64a5b Merge branch 'PHP-5.6' 2015-02-02 11:12:27 +00:00
Adam Harvey
db375cfd4d Merge branch 'PHP-5.5' into PHP-5.6 2015-02-02 11:11:05 +00:00
Adam Harvey
a7b3abe4e6 json_decode() should generate a syntax error when given "". 
Fixes bug #68938 (json_decode() decodes empty string without error).
Patch by jeremy at bat-country dot us.
 2015-02-02 11:07:34 +00: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
Stanislav Malyshev
1fdd558e39 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #50224 where float without decimals were converted to integer
  Updated NEWS for #68371
 2015-01-19 10:05:57 -08:00
Juan Basso
ac7cfad3b5 Fixed bug #50224 where float without decimals were converted to integer 2015-01-19 00:46:02 -08:00
Jakub Zelenka
3ddb5993dd Increase PHP_JSON_DOUBLE_MAX_LENGTH for fractional part 
This is probably not necessary as such number
is not realistic. It's just to be consistent
with jsond extension.
 2015-01-18 16:31:24 +00:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Stanislav Malyshev
7f95aa4d97 Fix bug #68817: Null pointer deference 2015-01-14 16:12:35 -08:00
Juan Basso
95cef47afb Porting implementation of RFC json_preserve_fractional_part 2015-01-12 21:29:52 -05:00
Jakub Zelenka
e6fb493e5d Refactore json double encoding to use php_gcvt 2015-01-11 13:30:21 +00:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Jakub Zelenka
8304e468cd Replace encoder functions json prefix with php_json 2015-01-10 19:13:28 +00:00
Jakub Zelenka
1119c4d2b2 Allow ill-formed unicode escapes in decoder 2015-01-04 17:34:49 +00:00
Jakub Zelenka
8e10250449 Use ZVAL_COPY_VALUE for copying parser result to return_value 2015-01-01 19:19:31 +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
4f6539bdaf Remove old parser 2014-12-14 19:12:24 +00:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Jakub Zelenka
0bfa245aa3 Modify json/tests/pass003 to ignore internal object ID 
Child is now created first - bottom up parsing (LR)
 2014-12-12 20:00:08 +00:00
Jakub Zelenka
9e5f687957 Fix json object decoding 2014-12-12 19:52:45 +00:00
Jakub Zelenka
c6d0905158 Do not copy return_value in parser 2014-12-07 20:27:03 +00:00
Jakub Zelenka
c51ea47996 Change string buffer handling in json scanner 2014-12-03 20:47:52 +00:00
Jakub Zelenka
098097d83f Fix compilation for json scanner 2014-11-30 18:29:48 +00:00
Jakub Zelenka
f18aae6042 Fix compilation for json_encoder 2014-11-30 17:47:17 +00:00
Jakub Zelenka
79e8355631 Fix compilation issues in json_parser 2014-11-26 20:49:55 +00:00
Jakub Zelenka
a4e59c39a7 Add missing bits to php_json.h 2014-11-25 20:36:41 +00:00
Jakub Zelenka
e18dd67975 Move json encoding stuff 2014-11-24 20:46:13 +00:00
Jakub Zelenka
f00b80a511 Implement initial changes for json_parser 2014-11-23 19:53:06 +00:00
Jakub Zelenka
ba70ba5f13 Replace INIT_PZVAL_COPY with ZVAL_DUP 2014-11-16 15:21:01 +00:00
Jakub Zelenka
432b73fdee Add error codes to php_json.h 2014-11-16 15:13:15 +00:00
Jakub Zelenka
d07bf91328 Initial import of jsond 2014-11-13 20:20:46 +00:00
Anatol Belski
7a6a3d923b fix arg order, CFLAGS is the fifth arg in m4 2014-10-17 16:03:40 +02:00
Anatol Belski
fea10f6a5e ext/iconv, ext/json and ext/session use static tsrmls pointer 2014-10-17 14:16:40 +02:00
Nikita Popov
016a96c7c2 Fix ::jsonSerialize() failure message 2014-10-12 20:55:51 +02:00
Anatol Belski
4b3e198023 removed *.dsw and *.dsp files 2014-09-28 19:02:09 +02:00
Nikita Popov
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