Skip to content

Jsond #993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 36 commits into from
Feb 8, 2015
Merged

Jsond #993

merged 36 commits into from
Feb 8, 2015

Conversation

bukka
Copy link
Member

@bukka bukka commented Jan 12, 2015

bukka and others added 25 commits November 13, 2014 20:20
@bukka
Initial import of jsond
d07bf91
@bukka
Add error codes to php_json.h
432b73f
@bukka
Replace INIT_PZVAL_COPY with ZVAL_DUP
ba70ba5
@bukka
Implement initial changes for json_parser
f00b80a
@bukka
Move json encoding stuff
e18dd67
@bukka
Add missing bits to php_json.h
a4e59c3
@bukka
Fix compilation issues in json_parser
79e8355
@bukka
Fix compilation for json_encoder
f18aae6
@bukka
Fix compilation for json scanner
098097d
@bukka
Change string buffer handling in json scanner
c51ea47
@bukka
Do not copy return_value in parser
c6d0905
@bukka
Fix json object decoding
9e5f687
@bukka
Modify json/tests/pass003 to ignore internal object ID
0bfa245 
Child is now created first - bottom up parsing (LR)
@bukka
Merge branch 'master' into jsond
b9ad000
@bukka
Remove old parser
4f6539b
@bukka
Merge branch 'master' into jsond
b68da91 
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
@bukka
Merge branch 'master' into jsond
8c4c16d
@bukka
Use ZVAL_COPY_VALUE for copying parser result to return_value
8e10250
@bukka
Merge branch 'master' into jsond
32d54ac
@bukka
Allow ill-formed unicode escapes in decoder
1119c4d
@bukka
Merge branch 'master' into jsond
1e49e96
@bukka
Replace encoder functions json prefix with php_json
8304e46
@bukka
Refactore json double encoding to use php_gcvt
e6fb493
@bukka
Merge branch 'master' into jsond
b3823f5 
Conflicts:
	ext/json/JSON_parser.c
	ext/json/JSON_parser.h
	ext/json/json.c
	ext/json/utf8_decode.c
@jrbasso
Porting implementation of RFC json_preserve_fractional_part
95cef47
bukka added 3 commits January 18, 2015 16:26
@bukka
Merge pull request #1 from jrbasso/json_preserve_fractional_part
91386cb 
Porting implementation of RFC json_preserve_fractional_part
@bukka
Increase PHP_JSON_DOUBLE_MAX_LENGTH for fractional part
3ddb599 
This is probably not necessary as such number
is not realistic. It's just to be consistent
with jsond extension.
@bukka
Merge branch 'master' into jsond
3159d51 
Conflicts:
	ext/json/JSON_parser.c
	ext/json/json.c
@bukka
Copy link
Member Author

bukka commented Jan 25, 2015

Travis fail seems to be unrelated to json:

=====================================================================
FAILED TEST SUMMARY
---------------------------------------------------------------------
Testing ftp_fget ignore autoresume if autoseek is switched off [ext/ftp/tests/ftp_fget_basic1.phpt]
IntlDateFormatter, calendars and time zone [ext/intl/tests/dateformat_calendars.phpt]
Bug #41970 (call_user_func_*() leaks on failure) [ext/standard/tests/general_functions/bug41970.phpt]
=====================================================================

@php-pulls php-pulls merged commit f282504 into php:master Feb 8, 2015
@JanTvrdik
Copy link

@bukka Could you update PHP_JSON_VERSION (probably to to 1.4.0)?

@bukka
Copy link
Member Author

bukka commented Feb 17, 2015

@JanTvrdik Done in 3ddc246 ;)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
RFC
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@bukka @JanTvrdik @weltling @Jan-E @jpauli @php-pulls @jrbasso