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)
We can't dereference dbh if it is NULL
Make sure value is initialized
Merge branch 'PHP-5.4' into PHP-5.5
fixed macro
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed macro
Reduce test noise in cross Oracle client <-> server version testing.
This change is already in PHP 5.6+
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+
Reduce test noise on cross Oracle client <-> server version tests.
This fix is already in PHP 5.6+
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Reduce test noise on cross Oracle client <-> server version tests. This fix is already in PHP 5.6+
add clear_env option to FPM config

This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
add clear_env option to FPM config

This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
add news entry
add news entry
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add news entry
  add clear_env option to FPM config
add missing NEWS entry
fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627