Merged revisions 283561 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Wed, 25 Aug 2010 16:14:11 +0000 (16:14 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Wed, 25 Aug 2010 16:14:11 +0000 (16:14 +0000)
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
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@283562 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_odbc.c

index d2ee979..a5d4ba9 100644 (file)
@@ -780,6 +780,7 @@ static int load_odbc_config(void)
                        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) {