[PHP-DOC] cvs: phpdoc /en/appendices migration52.xml /en/reference/curl constants.xml

[Hannes Magnusson]

bjori           Tue May 22 19:28:13 2007 UTC

  Modified files:              
    /phpdoc/en/appendices       migration52.xml 
    /phpdoc/en/reference/curl   constants.xml 
  Log:
  YACC
  - Add a note on CURLOPT_FOLLOWLOCATION & openbase_dir/safe_mode
  
  
http://cvs.php.net/viewvc.cgi/phpdoc/en/appendices/migration52.xml?r1=1.12&r2=1.13&diff_format=u
Index: phpdoc/en/appendices/migration52.xml
diff -u phpdoc/en/appendices/migration52.xml:1.12 
phpdoc/en/appendices/migration52.xml:1.13
--- phpdoc/en/appendices/migration52.xml:1.12   Tue May 22 19:13:55 2007
+++ phpdoc/en/appendices/migration52.xml        Tue May 22 19:28:13 2007
@@ -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 @@
      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>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/curl/constants.xml?r1=1.10&r2=1.11&diff_format=u
Index: phpdoc/en/reference/curl/constants.xml
diff -u phpdoc/en/reference/curl/constants.xml:1.10 
phpdoc/en/reference/curl/constants.xml:1.11
--- phpdoc/en/reference/curl/constants.xml:1.10 Tue May 22 19:13:55 2007
+++ phpdoc/en/reference/curl/constants.xml      Tue May 22 19:28:13 2007
@@ -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>
@@ -479,6 +480,20 @@
  <variablelist>
   <varlistentry>
    <term>
+    <constant>CURLOPT_TIMEOUT_MS</constant>
+    (<type>integer</type>)
+   </term>
+   <listitem>
+    <simpara>
+     
+    </simpara>
+   </listitem>
+  </varlistentry>
+ </variablelist>
+
+ <variablelist>
+  <varlistentry>
+   <term>
     <constant>CURLOPT_TCP_NODELAY</constant>
     (<type>integer</type>)
    </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>