]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorMichael Wallner <mike@php.net>
Thu, 17 Oct 2013 12:53:50 +0000 (14:53 +0200)
committerMichael Wallner <mike@php.net>
Thu, 17 Oct 2013 12:53:50 +0000 (14:53 +0200)
commit5a7ca69e56b8cbe5c8295f18db2aa443a083949b
tree8f07a95488a58796cd38c4c185e029f400ed83d3
parentbd666e2f99acfb1ec53efd300538a8477dedfe1c
parent2aaa3d538a7b93d92c52aec95707d8230f21be65
Merge branch 'PHP-5.5'

* PHP-5.5:
  Added support for TLSv1.1 and TLSv1.2

Conflicts:
ext/openssl/xp_ssl.c
ext/openssl/openssl.c
ext/openssl/xp_ssl.c
ext/standard/file.c
main/streams/php_stream_transport.h