Allow crypto_method context value in stream_socket_enable_crypto()
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
Fix memory leak in TSRM
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix memory leak in TSRM
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix memory leak in TSRM
make release tags not fail Travis CI
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  make release tags not fail Travis CI
oops, 5.4 and 5.5 use malloc in TSRM
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  oops, 5.4 and 5.5 use malloc in TSRM
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  oops, 5.4 and 5.5 use malloc in TSRM
Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream

upstream patch applied
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream
updated NEWS
- Fixed missing NULL check
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed missing NULL check
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  - Fixed missing NULL check
- Fixed missing NULL check in SimpleXMLElement::xpath()
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed missing NULL check in SimpleXMLElement::xpath()
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  - Fixed missing NULL check in SimpleXMLElement::xpath()
- Move checking