delta/php-git.git/ext/json, branch php-5.5.20 git.php.net: repository/php-src.git 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












Bump year
2014-01-03T03:06:16+00:00

Xinchen Hui
laruence@php.net

2014-01-03T03:06:16+00:00

47c902777297ce895aa915c13efdb00881af3669












Bump year
2014-01-03T03:04:26+00:00

Xinchen Hui
laruence@php.net

2014-01-03T03:04:26+00:00

c0d060f5c02db168f1de895b41afffbc6e3cacfb












Merge branch 'PHP-5.4' into PHP-5.5
2013-11-10T21:11:28+00:00

Adam Harvey
aharvey@php.net

2013-11-10T21:11:28+00:00

304bff90f42479d412e4124c11803f384cae909d

* PHP-5.4:
  Update NEWS and remove the unnecessary UPGRADING note.
  UPGRADING and NEWS
  Better test: Check combined leading/trailing
  Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")





* PHP-5.4:
  Update NEWS and remove the unnecessary UPGRADING note.
  UPGRADING and NEWS
  Better test: Check combined leading/trailing
  Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")







Fix #66021 (Blank line inside empty array/object)
2013-11-02T19:59:11+00:00

Kevin Israel
pleasestand@live.com

2013-11-02T19:47:24+00:00

82a4f1a1a287d9dbf01156bc14ceb13ccbf16d7a

Changed json_encode() so that when the JSON_PRETTY_PRINT option is specified,
the pair of linefeeds immediately after an opening bracket and before the
corresponding closing bracket is omitted when the array or object contains no
elements or accessible properties (and hence would have a blank line between
the brackets).





Changed json_encode() so that when the JSON_PRETTY_PRINT option is specified,
the pair of linefeeds immediately after an opening bracket and before the
corresponding closing bracket is omitted when the array or object contains no
elements or accessible properties (and hence would have a blank line between
the brackets).