From 8ba95510332f77dcbf6cd01a836db042244cde57 Mon Sep 17 00:00:00 2001
From: Andrea Faulds <ajf@php.net>
Date: Sat, 31 May 2014 14:06:49 +0000
Subject: [PATCH] Noted CURLOPT_SAFE_UPLOAD in curl_setopt, which was
 introduced in PHP 5.5

(Finally)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@333635 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/curl/functions/curl-setopt.xml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/reference/curl/functions/curl-setopt.xml b/reference/curl/functions/curl-setopt.xml
index ed68d727f5..44e94c4424 100644
--- a/reference/curl/functions/curl-setopt.xml
+++ b/reference/curl/functions/curl-setopt.xml
@@ -366,6 +366,20 @@
            <entry valign="top">
            </entry>
           </row>
+          <row>
+           <entry valign="top"><constant>CURLOPT_SAFE_UPLOAD</constant></entry>
+           <entry valign="top">
+            &true; to disable support for the <literal>@</literal> prefix for
+            uploading files in <constant>CURLOPT_POSTFIELDS</constant>, which
+            means that values starting with <literal>@</literal> can be safely
+            passed as fields. <classname>CURLFile</classname> may be used for
+            uploads instead.
+           </entry>
+           <entry valign="top">
+            &false; by default at present, but this is likely to be changed in a
+            future version of PHP.
+           </entry>
+          </row>
           <row>
            <entry valign="top"><constant>CURLOPT_SSL_VERIFYPEER</constant></entry>
            <entry valign="top">
@@ -999,7 +1013,10 @@
             </simpara>
             <simpara>
              As of PHP 5.5.0, the <literal>@</literal> prefix is deprecated and
-             files can be sent using <classname>CURLFile</classname>.
+             files can be sent using <classname>CURLFile</classname>. The 
+             <literal>@</literal> prefix can be disabled for safe passing of
+             values beginning with <literal>@</literal> by setting the 
+             <constant>CURLOPT_SAFE_UPLOAD</constant> option to &true;.
             </simpara>
            </entry>
            <entry valign="top">