Fix #66021 (Blank line inside empty array/object)

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).
fix merge issue
- Updated to version 2014.2 (2014b)
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5' into PHP-5.6
Fix test
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Merge branch 'PHP-5.5' into PHP-5.6
Remove unneeded string copy.
Allow to set ''(empty string values) internal/input/output_encoding for better compatibility. i.e. Runtime INI value changes.
More compliance to the RFC. Improve/add encoding handling tests. i.e. Rather than set encoding automagic way, detect it.
update lib versions
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update lib versions

Conflicts:
	win32/build/libs_version.txt
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update lib versions
Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)

On little endian:
	map->p == php_magic_database
	map->magic[i] = pointer into the map

	map->p == NULL
	map->magic[i] = pointer to allocated memory

On big endian (ppc64, s390x, ...):
	map->p != php_magic_database and map->p != NULL
        map->magic[i] = pointer into a copy of the map

Trying to efree pointer in the later cause memory corruption
Thanks to dkatulek / Red Hat for the report.
NEWS
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
NEWS
updated libmagic.patch
Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://"