Fixed bug #68370 ("unset($this)" can make the program crash)
Merge branch 'PHP-5.5' into PHP-5.6
Update NEWS
Merge branch 'PHP-5.6'

Conflicts:
	Zend/zend_execute_API.c
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Fixed segfault in  bug62500.phpt
move these functions to the appropriate place

and include the necessary header
use proper declarations for zend_stat_t
better description for the toolset config option
add php_create_socket/php_destroy_socket PHP_SOCKETS_API to abel to create socket ressource in other ext
update UPGRADING.INTERNALS
A better fix(do the convertion in compile time)
Merge branch 'master' of https://git.php.net/repository/php-src
convert_to_string also does the check
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:php-src:
  Update NEWS
  Fixed bug #68370 ("unset($this)" can make the program crash)
  Fix opcache.revalidate_freq per-request behavior
  Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
  Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src: (70 commits)
  convert_to_string also does the check
  A better fix(do the convertion in compile time)
  update UPGRADING.INTERNALS
  better description for the toolset config option
  use proper declarations for zend_stat_t
  move these functions to the appropriate place
  Fixed segfault in  bug62500.phpt
  Update NEWS
  Fixed bug #68370 ("unset($this)" can make the program crash)
  move more common ldflags into function
  rename intel toolset to icc - shorter
  fix gd compilation with icc toolset
  either ms or intel linker is used, /libpath is supported
  further catch up with phpize and improved clang arch setup
  add /fallback for clang-cl
  parametrize WINVER and update its value
  further refactoring of toolset+phpize stuff
  catch up the toolset changes with phpize
  fix linking for clang, using linker directly
  adjust pid_t declaration so it doesn't conflict with apache one
  ...
Fix skipif test here
Fix skipif test here
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Fixed bug #68370 ("unset($this)" can make the program crash)
  Fixed NEWS for 5.5
  Fix opcache.revalidate_freq per-request behavior
  Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
Fix skipif test here