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).
add vc12 (2013)
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

# By Xinchen Hui
# Via Xinchen Hui
* 'PHP-5.5' of git.php.net:php-src:
  Fixed coredump due to abnormal implemention of phar
  remove "PHP 6" staff
add vc12 (2013)
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
remove pcntl leftover from the test code
Merge branch 'PHP-5.6'

* PHP-5.6:
  remove pcntl leftover from the test code
--global have be removed in 5.2
man page: long option name is --strip, not --stripped
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
Merge branch 'PHP-5.6'

* PHP-5.6:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
primitive test fixes
Merge branch 'PHP-5.6'

* PHP-5.6:
  primitive test fixes
Allow NULL as value for CURLOPT_CUSTOMREQUEST option.

Added test case.

Refactored the code to isolate the string handling. Fixed return values to use SUCCESS and FAILURE.

Removed unused error variable.

Indentation fix.
Removed the ugly goto.
Fixed expected output of a few cURL test cases
Merge branch '5.5' into 5.6

* 5.5:
  Fixed expected output of a few cURL test cases
  Allow NULL as value for CURLOPT_CUSTOMREQUEST option.
Merge branch '5.6'

* 5.6:
  Fixed expected output of a few cURL test cases
  Allow NULL as value for CURLOPT_CUSTOMREQUEST option.
[bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given

A newline is added to the mail headers when mail.add_x_header is used and no other headers are passed to mail().

The scenario in which custom headers are used was already fixed in #48620, back in 2009.