delta/php-git.git/ext/json, branch php-5.5.24 git.php.net: repository/php-src.git Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are numbers plus the letter e) 2015-02-22T20:22:47+00:00 Jakub Zelenka bukka@php.net 2015-02-22T20:22:47+00:00 591dbcabe57a32550fb73223521fa1323773628f 






Revert "json_decode() should generate a syntax error when given ""."
2015-02-04T11:48:17+00:00

Julien Pauli
jpauli@php.net

2015-02-04T11:48:17+00:00

c85f12e3aca8d1da64504018e421a766ab66e574

This reverts commit a7b3abe4e6f5e2fdfd8d55b676c9ca6b3f9c8cc8.





This reverts commit a7b3abe4e6f5e2fdfd8d55b676c9ca6b3f9c8cc8.







json_decode() should generate a syntax error when given "".
2015-02-02T11:07:34+00:00

Adam Harvey
aharvey@php.net

2015-02-02T11:07:34+00:00

a7b3abe4e6f5e2fdfd8d55b676c9ca6b3f9c8cc8

Fixes bug #68938 (json_decode() decodes empty string without error).
Patch by jeremy at bat-country dot us.





Fixes bug #68938 (json_decode() decodes empty string without error).
Patch by jeremy at bat-country dot us.







Bump year
2015-01-15T15:26:03+00:00

Xinchen Hui
laruence@php.net

2015-01-15T15:09:28+00:00

73c1be26531f730d64d61962b56eaf28ce3fc6aa












Merge branch 'PHP-5.4' into PHP-5.5
2014-08-17T12:48:22+00:00

Lior Kaplan
kaplanlior@gmail.com

2014-08-17T12:48:22+00:00

be2128c8050fd8d22604acb0e225891551c81c8c

* PHP-5.4:
  typofixes





* PHP-5.4:
  typofixes







typofixes
2014-08-17T12:44:02+00:00

Veres Lajos
vlajos@gmail.com

2014-08-12T21:00:23+00:00

3f42f2f5d1c8026b6e1d21b91857a08d918c28c8












Merge branch 'PHP-5.4' into PHP-5.5
2014-04-14T01:55:28+00:00

Stanislav Malyshev
stas@php.net

2014-04-14T01:54:54+00:00

9bba219c75b0fa82846bc2fa260888cdc97ac6e6

* PHP-5.4:
  Fix #66021 (Blank line inside empty array/object)





* PHP-5.4:
  Fix #66021 (Blank line inside empty array/object)







Merge branch 'pull-request/518' into PHP-5.4
2014-04-14T01:50:39+00:00

Stanislav Malyshev
stas@php.net

2014-04-14T01:50:39+00:00

5e66ce929350b98003becd362464d47e8f49c8fb

* pull-request/518:
  Fix #66021 (Blank line inside empty array/object)





* pull-request/518:
  Fix #66021 (Blank line inside empty array/object)







Merge branch 'PHP-5.4' into PHP-5.5
2014-02-17T09:36:13+00:00

Julien Pauli
jpauli@php.net

2014-02-17T09:36:13+00:00

baafdad1503943150617654240780a170156d92a

* PHP-5.4:
  Export JsonSerializable Interface (bug #65753)





* PHP-5.4:
  Export JsonSerializable Interface (bug #65753)







Export JsonSerializable Interface (bug #65753)
2014-02-17T09:25:40+00:00

Julien Pauli
jpauli@php.net

2014-02-17T09:25:40+00:00

786234d351c40a9b4808d1dd13d2f91f2f5314be