From 60917b8446cca5681c170d8f61ba6cb5a44d8f31 Mon Sep 17 00:00:00 2001
From: Rasmus Lerdorf <rasmus@php.net>
Date: Thu, 16 Oct 2014 17:51:38 +0000
Subject: [PATCH] POODLE commit

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@335076 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/curl/functions/curl-setopt.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/reference/curl/functions/curl-setopt.xml b/reference/curl/functions/curl-setopt.xml
index 6d8c6d7916..1363b0afa8 100644
--- a/reference/curl/functions/curl-setopt.xml
+++ b/reference/curl/functions/curl-setopt.xml
@@ -723,8 +723,16 @@
           <row>
            <entry valign="top"><constant>CURLOPT_SSLVERSION</constant></entry>
            <entry valign="top">
-            The SSL version (2 or 3) to use. By default PHP will try to determine
-            this itself, although in some cases this must be set manually.
+            One of <constant>CURL_SSLVERSION_DEFAULT</constant> (0),
+            <constant>CURL_SSLVERSION_TLSv1</constant> (1),
+            <constant>CURL_SSLVERSION_SSLv2</constant> (2) or
+            <constant>CURL_SSLVERSION_SSLv3</constant> (3).
+            <note>
+             <para>
+              Setting this to anything other than 0 or 1 is dangerous given
+              the known vulnerabilities in SSLv2 and SSLv3.
+             </para>
+            </note>
            </entry>
            <entry valign="top">
            </entry>