]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorMichael Wallner <mike@php.net>
Thu, 17 Oct 2013 13:22:07 +0000 (15:22 +0200)
committerMichael Wallner <mike@php.net>
Thu, 17 Oct 2013 13:22:07 +0000 (15:22 +0200)
commitdd3a4c303b31c2ba23ab01d30845e6973d5aa37d
tree2b4d88634f6ca38d24acdda105de0c29275ea418
parente6481e23934f2befca0305888b9500193eddad7f
parentd89d46d9409309592b1896493d85ff35974321f3
Merge branch 'PHP-5.5'

* PHP-5.5:
  Revert "TLS news"
  Revert "Added support for TLSv1.1 and TLSv1.2"
ext/openssl/openssl.c
ext/openssl/xp_ssl.c
ext/standard/file.c
main/streams/php_stream_transport.h