History log of /php-src/ext/json/json_scanner.re (Results 26 – 29 of 29)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
(<<< Hide modified files)
(Show modified files >>>)
# b68da91d 27-Dec-2014 Jakub Zelenka

Merge branch 'master' into jsond

Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/config.m4
ext/json/config.w32
e

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

show more ...


Revision tags: POST_NATIVE_TLS_MERGE, PRE_NATIVE_TLS_MERGE, php-5.5.20, php-5.4.36, php-5.6.4
# c51ea479 03-Dec-2014 Jakub Zelenka

Change string buffer handling in json scanner

# 098097d8 30-Nov-2014 Jakub Zelenka

Fix compilation for json scanner

Revision tags: php-5.6.4RC1, php-5.5.20RC1
# d07bf913 13-Nov-2014 Jakub Zelenka

Initial import of jsond

12