]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.5:
  Revert "TLS news"
  Revert "Added support for TLSv1.1 and TLSv1.2"

1  2 
ext/openssl/openssl.c
ext/openssl/xp_ssl.c
ext/standard/file.c
main/streams/php_stream_transport.h

Simple merge
Simple merge
Simple merge
Simple merge