diff options
author | Christopher Jones <sixd@php.net> | 2013-10-17 09:23:15 -0700 |
---|---|---|
committer | Christopher Jones <sixd@php.net> | 2013-10-17 09:23:15 -0700 |
commit | cefbf932c8df6e03180d00d08305f957e602fbd0 (patch) | |
tree | e297a2f18c00e8cb601c5ee08b0199cf663c0f96 /ext/oci8/php_oci8.h | |
parent | 134caeb8370d68fbea333be3c24be92bf09e430b (diff) | |
parent | 66868c8fd4054eb99d8b4f255620d8630fa929c2 (diff) | |
download | php-git-cefbf932c8df6e03180d00d08305f957e602fbd0.tar.gz |
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
Diffstat (limited to 'ext/oci8/php_oci8.h')
0 files changed, 0 insertions, 0 deletions