From c91d2457f16bf215d47aa6e7412ee1c16e395263 Mon Sep 17 00:00:00 2001
From: Hannes Magnusson <bjori@php.net>
Date: Sat, 9 Feb 2013 02:08:14 +0000
Subject: [PATCH] Added "socketTimeoutMS" & "connectTimeoutMS" options, as of
 1.3.4

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@329457 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mongo/mongoclient/construct.xml | 35 +++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/reference/mongo/mongoclient/construct.xml b/reference/mongo/mongoclient/construct.xml
index f9aab62297..db2df8c3a2 100644
--- a/reference/mongo/mongoclient/construct.xml
+++ b/reference/mongo/mongoclient/construct.xml
@@ -167,13 +167,35 @@ mongodb://[username:password@]host1[:port1][,host2[:port2:],...]/db
           See the replica set example below for details.
          </para>
         </listitem>
+        <listitem>
+         <para>
+          <literal>"connectTimeoutMS"</literal>
+         </para>
+         <para>
+          How long a connection can take to be opened before timing out.
+         </para>
+        </listitem>
         <listitem>
          <para>
           <literal>"timeout"</literal>
          </para>
          <para>
-          For how long the driver should try to connect to the database (in
-          milliseconds).
+          Deprecated alias for "connectTimeoutMS"
+         </para>
+        </listitem>
+        <listitem>
+         <para>
+          <literal>"socketTimeoutMS"</literal>
+         </para>
+         <para>
+          How long a send or receive on a socket can take before timing out.
+          <note>
+           <simpara>
+            This is a client side timeout. If a <literal>insert</literal> hits
+            the socketTimeoutMS there is no way to know if the server actually
+            received the write or not.
+           </simpara>
+          </note>
          </para>
         </listitem>
         <listitem>
@@ -263,6 +285,15 @@ mongodb://[username:password@]host1[:port1][,host2[:port2:],...]/db
       </row>
      </thead>
      <tbody>
+      <row>
+       <entry>1.3.4</entry>
+       <entry>
+        <para>
+         Added the <literal>"connectTimeoutMS"</literal> and
+         <literal>"socketTimeoutMS"</literal> options.
+        </para>
+       </entry>
+      </row>
       <row>
        <entry>1.3.0</entry>
        <entry>