From: Chris Rienzo <chris.rienzo@grasshopper.com>
Date: Wed, 4 Mar 2015 14:06:10 +0000 (-0500)
Subject: FS-7346 #resolve #comment update mod_mongo driver to 1.1.0
X-Git-Tag: v1.4.18~1^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e338b8865b86537d9997074dc44165ee201915d5;p=thirdparty%2Ffreeswitch.git

FS-7346 #resolve #comment update mod_mongo driver to 1.1.0
---

diff --git a/conf/vanilla/autoload_configs/mongo.conf.xml b/conf/vanilla/autoload_configs/mongo.conf.xml
index 72fffafbb7..5adf148e7d 100644
--- a/conf/vanilla/autoload_configs/mongo.conf.xml
+++ b/conf/vanilla/autoload_configs/mongo.conf.xml
@@ -1,15 +1,9 @@
 <configuration name="mongo.conf">
   <settings>
     <!-- 
-      connection-string handles different ways to connect to mongo
-      samples:
-         server:port
-         foo/server:port,server:port   SET
+         mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]
     -->
-    <param name="connection-string" value="127.0.0.1:27017"/>
-    <param name="max-connections" value="100"/>
-    <!-- Timeout in seconds.  0 means no timeout -->
-    <param name="socket-timeout" value="0"/>
+    <param name="connection-string" value="mongodb://127.0.0.1:27017/?connectTimeoutMS=10000"/>
 
 <!--
     <param name="map" value="function() { emit(this.a, 1); }"/>
diff --git a/freeswitch.spec b/freeswitch.spec
index a24d1ff45d..6981ae3f58 100644
--- a/freeswitch.spec
+++ b/freeswitch.spec
@@ -129,7 +129,7 @@ Source10:	http://files.freeswitch.org/downloads/libs/libmemcached-0.32.tar.gz
 Source11:       http://files.freeswitch.org/downloads/libs/json-c-0.9.tar.gz
 Source12:       http://files.freeswitch.org/downloads/libs/opus-1.1-p2.tar.gz
 Source13:       http://files.freeswitch.org/downloads/libs/v8-3.24.14.tar.bz2
-Source14:       http://files.freeswitch.org/downloads/libs/mongo-c-driver-0.92.2.tar.gz
+Source14:       http://files.freeswitch.org/downloads/libs/mongo-c-driver-1.1.0.tar.gz
 Prefix:        	%{prefix}
 
 
diff --git a/src/mod/applications/mod_mongo/Makefile.am b/src/mod/applications/mod_mongo/Makefile.am
index 8b37d59da7..2249d5613b 100644
--- a/src/mod/applications/mod_mongo/Makefile.am
+++ b/src/mod/applications/mod_mongo/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/build/modmake.rulesam
 AUTOMAKE_OPTIONS += foreign
 MODNAME=mod_mongo
 
-MONGOC=mongo-c-driver-0.92.2
+MONGOC=mongo-c-driver-1.1.0
 MONGOC_DIR=$(switch_srcdir)/libs/$(MONGOC)
 MONGOC_BUILDDIR=$(switch_builddir)/libs/$(MONGOC)
 MONGOC_LA=$(MONGOC_BUILDDIR)/libmongoc-priv.la