[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-doc-cvs
Subject:    [DOC-CVS] =?utf-8?q?svn:_/phpdoc/_doc-base/trunk/entities/global.ent_en/trunk/reference/mongo/mongoc
From:       Hannes_Magnusson <bjori () php ! net>
Date:       2014-04-18 23:17:28
Message-ID: svn-bjori-1397863048-333380-606697053 () svn ! php ! net
[Download RAW message or body]

bjori                                    Fri, 18 Apr 2014 23:17:28 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=333380

Log:
Document new connection options
- authMechanism
- authSource
- gssapiServiceName
- secondaryAcceptableLatencyMS

https://jira.mongodb.org/browse/PHP-1042

Changed paths:
    U   phpdoc/doc-base/trunk/entities/global.ent
    U   phpdoc/en/trunk/reference/mongo/mongoclient/construct.xml

Modified: phpdoc/doc-base/trunk/entities/global.ent
===================================================================
--- phpdoc/doc-base/trunk/entities/global.ent	2014-04-18 23:14:32 UTC (rev 333379)
+++ phpdoc/doc-base/trunk/entities/global.ent	2014-04-18 23:17:28 UTC (rev 333380)
@@ -351,6 +351,7 @@
 <!ENTITY url.mongodb.docs.tagsets \
"http://docs.mongodb.org/manual/tutorial/configure-replica-set-tag-sets/">  <!ENTITY \
url.mongodb.docs.expire_data "http://docs.mongodb.org/manual/tutorial/expire-data/">  \
<!ENTITY url.mongodb.docs.command \
"http://docs.mongodb.org/manual/reference/command/"> +<!ENTITY \
url.mongodb.docs.kerberos.service-principal \
"http://docs.mongodb.org/manual/core/kerberos/#kerberos-service-principal">  <!ENTITY \
url.mono "http://www.mono-project.com/">  <!ENTITY url.mnogo \
"http://www.mnogosearch.org/">  <!ENTITY url.msession \
"http://www.mohawksoft.org/?q=node/8">

Modified: phpdoc/en/trunk/reference/mongo/mongoclient/construct.xml
===================================================================
--- phpdoc/en/trunk/reference/mongo/mongoclient/construct.xml	2014-04-18 23:14:32 UTC \
                (rev 333379)
+++ phpdoc/en/trunk/reference/mongo/mongoclient/construct.xml	2014-04-18 23:17:28 UTC \
(rev 333380) @@ -92,6 +92,55 @@
        <itemizedlist>
         <listitem>
          <para>
+          <literal>"authMechanism"</literal>
+         </para>
+         <para>
+          Available mechanisms are:
+          <informaltable>
+           <tgroup cols="3">
+            <thead>
+             <row>
+              <entry>authMechanism</entry>
+              <entry>Description</entry>
+              <entry>Availability</entry>
+             </row>
+            </thead>
+            <tbody>
+             <row>
+              <entry>MONGODB-CR</entry>
+              <entry>Authenticate using Challenge Response mechanism. This is the \
default value.</entry> +              <entry>All MongoDB versions</entry>
+             </row>
+             <row>
+              <entry>X509</entry>
+              <entry>Authenticates using X509 certificates</entry>
+              <entry>MongoDB 2.6. Only available when <xref linkend="book.openssl" \
/> is enabled</entry> +             </row>
+             <row>
+              <entry>PLAIN</entry>
+              <entry>Authenticates using unencrypted plain username+password. Must \
be used over SSL connections. Generally used by MongoDB to login via 3rd party LDAP \
server</entry> +              <entry>MongoDB Enterprise 2.4. The Driver must be \
compiled against CyrusSASL2</entry> +             </row>
+             <row>
+              <entry>GSSAPI</entry>
+              <entry>Authenticates via kerberos systems</entry>
+              <entry>MongoDB Enterprise 2.4. The Driver must be compiled against \
CyrusSASL2</entry> +             </row>
+            </tbody>
+           </tgroup>
+          </informaltable>
+         </para>
+        </listitem>
+        <listitem>
+         <para>
+          <literal>"authSource"</literal>
+         </para>
+         <para>
+          Should be set to the database name where the user is defined it.
+         </para>
+        </listitem>
+        <listitem>
+         <para>
           <literal>"connect"</literal>
          </para>
          <para>
@@ -174,6 +223,14 @@
         </listitem>
         <listitem>
          <para>
+          <literal>"gssapiServiceName"</literal>
+         </para>
+         <para>
+          Sets the <link \
xlink:href="&url.mongodb.docs.kerberos.service-principal;">Kerberos service \
principal</link>. Only applicable when authMechanism=GSSAPI. Defaults to "mongodb". + \
</para> +        </listitem>
+        <listitem>
+         <para>
           <literal>"password"</literal>
          </para>
          <para>
@@ -229,6 +286,15 @@
         </listitem>
         <listitem>
          <para>
+          <literal>"secondaryAcceptableLatencyMS"</literal>
+         </para>
+         <para>
+          When reading from a secondary (using ReadPreferences), do not read from \
secondaries known to be more then +          \
<literal>secondaryAcceptableLatencyMS</literal> away from us. Defaults to \
<literal>15</literal> +         </para>
+        </listitem>
+        <listitem>
+         <para>
           <literal>"socketTimeoutMS"</literal>
          </para>
          <para>
@@ -605,6 +671,14 @@
      </thead>
      <tbody>
       <row>
+       <entry>1.5.0</entry>
+       <entry>
+        <para>
+         Added <literal>"authMechanism"</literal>, \
<literal>"gssapiServiceName"</literal>, and \
<literal>"secondaryAcceptableLatencyMS"</literal>. +        </para>
+       </entry>
+      </row>
+      <row>
        <entry>1.4.0</entry>
        <entry>
         <para>
@@ -618,6 +692,14 @@
        </entry>
       </row>
       <row>
+       <entry>1.5.0</entry>
+       <entry>
+        <para>
+         Added <literal>"authSource"</literal>.
+        </para>
+       </entry>
+      </row>
+      <row>
        <entry>1.3.4</entry>
        <entry>
         <para>



-- 
PHP Documentation Commits Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]