Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/repository/php-src:
  fix using wrong buffer pointer
Switch to using freetype-config for freetype detection.

This fixes GD compilation against libfreetype 2.5.1 and later after they made
the rather interesting decision to change their include directory layout in a
point release.

The original suggestion in the bug was to use pkg-config, but my inclination is
to use freetype-config instead: we should be able to get the same configuration
information without actually needing pkg-config installed, since pkg-config is
by no means guaranteed to exist on many Unices and distros, whereas
freetype-config should always be present if a libfreetype build environment is
installed. Let's try it out and see what happens.

Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)).
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Switch to using freetype-config for freetype detection.
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Switch to using freetype-config for freetype detection.
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse

Conflicts:
	configure.in
	main/php_version.h
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src:
  Fixed Bug #66218 zend_register_functions breaks reflection
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
Merge branch 'PHP-5.6'

* PHP-5.6:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
Zend: fix overflow handling bug in non-x86 fast_add_function()

The 'result' argument of fast_add_function() may alias with either
of its operands (or both). Take care not to write to 'result' before
reading op1 and op2.
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fix dir separator in cve-2013-6420 test
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix dir separator in cve-2013-6420 test
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix dir separator in cve-2013-6420 test
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix dir separator in cve-2013-6420 test
added missing prototype
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  added missing prototype
Merge branch 'PHP-5.6'

* PHP-5.6:
  added missing prototype