Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Assume the free space is correct on Travis CI.
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  TLS news
  previous revert killed that file
  Revert "TLS news"
  Revert "Added support for TLSv1.1 and TLSv1.2"
  TLS news
  fix ws
  Added support for TLSv1.1 and TLSv1.2
  Added support for TLSv1.1 and TLSv1.2
Prepare for OCI8 2.0.5 release