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).
Fixed bug 64604
Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec

curl_exec returns an empty string when data is received from a domain that returns zero content. curl_multi_getcontent
returned null. Now it returns an empty string fixing the incosistency
Reverted to 5a0da281e5a9fa02db18b4822d8b103c65849fa9
Discussion: http://news.php.net/php.cvs/76836
Merge branch 'PHP-5.4' into PHP-5.5
Bug #66840: Fix broken build when extension built separately
Merge branch 'PHP-5.6'

* PHP-5.6:
  Bug #66840: Fix broken build when extension built separately
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'
Fixed bug #67024 - getimagesize should recognize BMP files with negative height
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height
fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height
Fix bug #66721

Add NULL check to php_date_parse_tzfile's retval
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #66721
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #66721
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix bug #66721