From 7c2c39378e3c9e68c628979f934fe1dcd2d44098 Mon Sep 17 00:00:00 2001
From: Hannes Magnusson <bjori@php.net>
Date: Tue, 22 May 2007 19:28:13 +0000
Subject: [PATCH] YACC - Add a note on CURLOPT_FOLLOWLOCATION &
 openbase_dir/safe_mode

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@236155 c90b9560-bf6c-de11-be94-00142212c4b1
---
 appendices/migration52.xml   | 18 +++++++++++++++++-
 reference/curl/constants.xml | 34 ++++++++++++++++++++++++++++++++--
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/appendices/migration52.xml b/appendices/migration52.xml
index 6297e40731..de2c7013d4 100644
--- a/appendices/migration52.xml
+++ b/appendices/migration52.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
 <appendix id="migration52">
  <title>Migrating from PHP 5.1.x to PHP 5.2.x</title>
 
@@ -1594,6 +1594,22 @@ $obj->getCommentName('');
      Added in PHP 5.2.1.
     </simpara>
    </listitem>
+   <listitem>
+    <simpara>
+     <constant>CURLOPT_TIMEOUT_MS</constant>
+    </simpara>
+    <simpara>
+     Added in PHP 5.2.3
+    </simpara>
+   </listitem>
+   <listitem>
+    <simpara>
+     <constant>CURLOPT_CONNECTTIMEOUT_MS</constant>
+    </simpara>
+    <simpara>
+     Added in PHP 5.2.3
+    </simpara>
+   </listitem>
   </itemizedlist>
 
   <para><link linkend="ref.gmp">GMP</link>:</para>
diff --git a/reference/curl/constants.xml b/reference/curl/constants.xml
index 2a67778b8b..b122b0011c 100644
--- a/reference/curl/constants.xml
+++ b/reference/curl/constants.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <refentry id="curl.constants">
  <refnamediv>
   <refname>Constants</refname>
@@ -379,7 +379,8 @@
    </term>
    <listitem>
     <simpara>
-     
+     This constant is not available when opendbase_dir or safe_mode are
+     enabled.
     </simpara>
    </listitem>
   </varlistentry>
@@ -476,6 +477,20 @@
   </varlistentry>
  </variablelist>
 
+ <variablelist>
+  <varlistentry>
+   <term>
+    <constant>CURLOPT_TIMEOUT_MS</constant>
+    (<type>integer</type>)
+   </term>
+   <listitem>
+    <simpara>
+     
+    </simpara>
+   </listitem>
+  </varlistentry>
+ </variablelist>
+
  <variablelist>
   <varlistentry>
    <term>
@@ -997,6 +1012,21 @@
    </listitem>
   </varlistentry>
  </variablelist>
+
+ <variablelist>
+  <varlistentry>
+   <term>
+    <constant>CURLOPT_CONNECTTIMEOUT_MS</constant>
+    (<type>integer</type>)
+   </term>
+   <listitem>
+    <simpara>
+     
+    </simpara>
+   </listitem>
+  </varlistentry>
+ </variablelist>
+
  <variablelist>
   <varlistentry>
    <term>