[svn-commits] tilghman: trunk r283562 - in /trunk: ./ res/res_odbc.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Aug 25 11:14:11 2010
New Revision: 283562

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=283562
Log:
Merged revisions 283561 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r283561 | tilghman | 2010-08-25 11:12:43 -0500 (Wed, 25 Aug 2010) | 5 lines
  
  Initialize connect timeout on each time through the loop.
  
  (closes issue #17911)
   Reported by: wurstsalat
........

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

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/res/res_odbc.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_odbc.c?view=diff&rev=283562&r1=283561&r2=283562
==============================================================================
--- trunk/res/res_odbc.c (original)
+++ trunk/res/res_odbc.c Wed Aug 25 11:14:11 2010
@@ -780,6 +780,7 @@
 			pooling = 0;
 			limit = 0;
 			bse = 1;
+			conntimeout = 10;
 			forcecommit = 0;
 			isolation = SQL_TXN_READ_COMMITTED;
 			for (v = ast_variable_browse(config, cat); v; v = v->next) {