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
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src:
  bump version
  Update NEWS
  fix bug #65481 (shutdown segfault due to serialize)
  Track created curl_slist structs by option so they can be updated in situ.
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
  added new glob() test
  fix using wrong buffer pointer
  Fix bug #65470	Segmentation fault in zend_error() with --enable-dtrace
  Fix for php bug #64802 includes test case
  new for fix #65225
  Fixed #65225: PHP_BINARY incorrectly set
  Use pkg-config to detect iodbc
  Add -P option to use the current binary
  Create test to the extension xmlrpc
  Fixbug: phpize --clean will delete include/*.h
Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
fixed skeleton to produce the normalized ext version macros

See http://news.php.net/php.pecl.dev/11191 for more info.
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed skeleton to produce the normalized ext version macros
added notes about the PECL site conformity
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  added notes about the PECL site conformity
fix whitespaces
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix whitespaces
5.5.6 now
Better test: Check combined leading/trailing
Merge branch 'PHP-5.4' into JSONWhitespaceFix
UPGRADING and NEWS
Fixed bug #65911 ($this not usable as static property)

In context of static accesses like classname::$this, the string
"$this" should not be handled like a $this variable, but as an
identifier for a static variable.
Merge branch 'PHP-5.4' into PHP-5.5
Add ability of alias resolving (it cause problem while work with opcache)
Assume the free space is correct on Travis CI.
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Assume the free space is correct on Travis CI.
Added support for TLSv1.1 and TLSv1.2

Conflicts:
	ext/openssl/xp_ssl.c
TLS news