[asterisk-commits] tilghman: trunk r43465 - in /trunk: ./ configs/ res/

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Thu Sep 21 18:29:32 2006
New Revision: 43465

URL: http://svn.digium.com/view/asterisk?rev=43465&view=rev
Log:
Merged revisions 43464 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r43464 | tilghman | 2006-09-21 18:24:41 -0500 (Thu, 21 Sep 2006) | 2 lines

Twould help if we actually documented how the new features in res_odbc actually work. (Oops)

........

Modified:
    trunk/   (props changed)
    trunk/configs/res_odbc.conf.sample
    trunk/res/res_odbc.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Sep 21 18:29:32 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-43376,43383,43386,43388,43392,43396,43405,43410,43422,43441,43445,43450,43454,43456
+/branches/1.4:1-43376,43383,43386,43388,43392,43396,43405,43410,43422,43441,43445,43450,43454,43456,43464

Modified: trunk/configs/res_odbc.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/res_odbc.conf.sample?rev=43465&r1=43464&r2=43465&view=diff
==============================================================================
--- trunk/configs/res_odbc.conf.sample (original)
+++ trunk/configs/res_odbc.conf.sample Thu Sep 21 18:29:32 2006
@@ -24,8 +24,18 @@
 password => mypass
 pre-connect => yes
 
+; Certain servers, such as MS SQL Server and Sybase use the TDS protocol, which
+; limits the number of active queries per connection to 1.  By setting up pools
+; of connections, Asterisk can be made to work with these servers.
+[sqlserver]
+enabled => no
+dsn => mickeysoft
+pooling => yes
+limit => 5
+username => oscar
+password => thegrouch
+pre-connect => yes
 
 
 
 
-

Modified: trunk/res/res_odbc.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_odbc.c?rev=43465&r1=43464&r2=43465&view=diff
==============================================================================
--- trunk/res/res_odbc.c (original)
+++ trunk/res/res_odbc.c Thu Sep 21 18:29:32 2006
@@ -235,7 +235,8 @@
 			limit = 0;
 			for (v = ast_variable_browse(config, cat); v; v = v->next) {
 				if (!strcasecmp(v->name, "pooling")) {
-					pooling = 1;
+					if (ast_true(v->value))
+						pooling = 1;
 				} else if (!strcasecmp(v->name, "limit")) {
 					sscanf(v->value, "%d", &limit);
 					if (ast_true(v->value) && !limit) {