Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
Better test: Check combined leading/trailing
Merge branch 'PHP-5.4' into JSONWhitespaceFix
UPGRADING and NEWS
Merge remote-tracking branch 'ajf/JSONWhitespaceFix' into PHP-5.4
Update NEWS and remove the unnecessary UPGRADING note.
Merge branch 'PHP-5.4' into PHP-5.5

* 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")
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  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")
Merge branch 'PHP-5.6'

* PHP-5.6:
  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")
5.5.7 now
Allow $num=0 in array_fill()

Implemented request #49824.
Merge branch 'PHP-5.6'
Fix failed test with recent glibc

In recent version of strptime glibc upstream has fixed a discrepancy between
documentation and actual behaviour by skipping over the sequence that would match %Z.
See http://repo.or.cz/w/glibc.git/commitdiff/ddc7e412ab252e7360a4357664beb3b5d9c4f42b

So when %Z is used in format
glibc <= 2.18 returns the GMT as unparsed
glibc >= 2.19 returns empty string

Removing %Z from tested format gives the same behavior with all version.
fix merge
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix failed test with recent glibc
  5.5.7 now
Move the JSON bugfix into the 5.5.6 changelog.
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	NEWS
Merge branch 'PHP-5.6'
Fix Bug #65714 	PHP cli forces the tty to cooked mode

Only drop the using_history() call with libedit as I don't know
if it is required with readline.

This also allow to run a php script in background without
it being aborted on first output.
NEWS