Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  This will be PHP 5.3.20
  fix NEWS
  Fixed bug #63447 (max_input_vars doesn't filter variables when mbstring.encoding_translation = On)
  News entry for png memleak fix
  News entry for png memleak fix
  These need to be volatile in order to prevent leaking after the longjmp in the error handler
  These need to be volatile in order to prevent leaking after the longjmp in the error handler
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  make failed tests fail the test target
  fix invalid read when trimming empty string
  - Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created)
Corrected grammar/spelling of text in php.ini files

There are no actual code changes here; I corrected grammar and spelling
errors in the php.ini-production and php.ini-development files. I also
rewrote some sentences to make them less cumbersome.
Corrected spelling of 'shortcut'
Merge branch 'PHP-5.5'

* PHP-5.5:
  Build .xz archive during makedist
  NEWS: remove dots at the end of the NEWS file
  PHP-5.5 is open
  Add missing parts from UPGRADING to NEWS
Bump version to 5.5.99 and reset NEWS
Merge branch 'PHP-5.5'

* PHP-5.5:
  Enabled apache 2.4 handler build option
Bump version to 5.6.0
Merge branch 'PHP-5.5'

* PHP-5.5:
  Bump API versions
Merge branch 'PHP-5.5'

* PHP-5.5:
  Updated NEWS
  UPdated NEWS
  Updated NEWS
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed compiler reenterability
  Fixed compiler reenterability
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed test sapi/cli/tests/006.phpt
Leftover: Bump version to 5.6.0
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src: (24 commits)
  Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
  Leftover: Bump version to 5.6.0
  Fixed test sapi/cli/tests/006.phpt
  Fixed compiler reenterability
  Fixed compiler reenterability
  Updated NEWS
  UPdated NEWS
  Updated NEWS
  Bump API versions
  Bump version to 5.6.0
  Enabled apache 2.4 handler build option
  Bump version to 5.5.99 and reset NEWS
  Build .xz archive during makedist
  NEWS: remove dots at the end of the NEWS file
  PHP-5.5 is open
  Add missing parts from UPGRADING to NEWS
  Fixed sockets ext build on win
  - Updated to version 2012.10 (2012j)
  List ext/intl changes also in NEWS
  Update arginfo for preg_match_all() to reflect reality.
  ...
Merge branch 'PHP-5.5'
Merge branch 'PHP-5.5'
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Fixed ext/intl/tests/timezone_createDefault_basic.phpt
  Skip test if directory does not exist
  Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
  Leftover: Bump version to 5.6.0
  Fixed test sapi/cli/tests/006.phpt
  Fixed compiler reenterability
  Fixed compiler reenterability
  Updated NEWS
  UPdated NEWS
  Updated NEWS
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
Merge branch 'PHP-5.5'

* PHP-5.5:
  Regenerate Zend ini scanner