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 branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed issue #115 (path issue when using phar). Fixed issue #149 (Phar mount points not working with OPcache enabled).

Conflicts:
	NEWS
Fix broken test
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix broken test
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix broken test
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix broken test

Conflicts:
	NEWS
missing 'config.h' in 5dc37b3
Merge branch 'PHP-5.6'

* PHP-5.6:
  missing 'config.h' in 5dc37b3
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")
Fixed case part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
5.5.7 now
Implemented FR #65917 (getallheaders() is not supported by the built-in...)

- Implemented apache_request_headers() and getallheaders() alias in CLI server
- Implemented apache_response_headers() in CLI server using FastCGI code

Conflicts:
	NEWS
	UPGRADING
Rewrote test using tcp instead of http:// stream