Allow crypto_method context value in stream_socket_enable_crypto()
Fix author name on the #63228 patch.
Fix typo
Fixed tests (they might fail from time to time because of session GC)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.
Fixed test (it requires ext/hash)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed test (it requires ext/hash)
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed test (it requires ext/hash)
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed test (it requires ext/hash)

Conflicts:
	ext/session/tests/031.phpt
Bug #67224: stream_socket_enable_crypto()

- Allow crypto_method context value in stream_socket_enable_crypto()
- As of 5.6.x stream crypto type may be specified in the SSL context,
  making the $crypto_type parameter to stream_socket_enable_crypto()
  optional. This commit checks for a crypto type in the context prior
  to erroring out.
- Update NEWS/UPGRADING
Merge branch 'PHP-5.6'

* PHP-5.6:
  Allow crypto_method context value in stream_socket_enable_crypto()
Merge branch 'master' of git://github.com/php/php-src