Merge branch 'master' of https://github.com/php/php-src

* 'master' of https://github.com/php/php-src:
  add text for the new constants
  add new consts
Verify peers by default in client socket operations
Update NEWS/UPGRADING
Merge branch 'PHP-5.6'

* PHP-5.6:
  Update NEWS/UPGRADING
  Verify peers by default in client socket operations

Conflicts:
	ext/openssl/xp_ssl.c