Allow crypto_method context value in stream_socket_enable_crypto()
Merge remote-tracking branch 'origin/PHP-5.6'

* origin/PHP-5.6:
  Added further notice about removal of IS_CONSTANT_INDEX/ARRAY macros
  separate travis jobs for debug and non-debug builds
  separate travis jobs for TS and NTS builds
  put this test back to XFAIL, as it was before, since it is still leaking memory
Merge branch 'PHP-5.6'

* PHP-5.6:
  BFN
  fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix test locality inconsitency
Merge branch 'PHP-5.6'

* PHP-5.6:
  add some missing NEWS entries
Merge branch 'PHP-5.6'
Merge branch 'PHP-5.6'

* PHP-5.6:
  add missing NEWS entry to the correct release where it was added
  5.5.12 was released yesterday
  add missing NEWS entry to the correct release where it was added
  add missing NEWS entry to the correct release where it was added
Merge sapi/phpdbg
Merge branch 'PHP-5.6'
Merge branch 'PHP-5.6'
Merge branch 'PHP-5.6'

* PHP-5.6:
  XFAIL the leaking multibyte tests, we should really get to the bottom of this
Merge branch 'PHP-5.6'

* PHP-5.6:
  add new NEWS block for alpha3
Merge branch 'PHP-5.6'

* PHP-5.6:
  Use the right path for the suggested PHP invocation in ext_skel.
  Changed to more understandable NEWS message
  one heading is enough
Merge branch 'PHP-5.6'

* PHP-5.6:
  show leaks in their own group
Merge branch 'PHP-5.6'

* PHP-5.6:
  Revert "show leaks in their own group" using valgrind would be a bit too much for travis I guess.
Merge branch 'PHP-5.6'
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix author name on the #63228 patch.
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix mysqli build when building against libmysqlclient.
Merge branch 'PHP-5.5'

* PHP-5.5:
  only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654
Merge branch 'PHP-5.6'