aboutsummaryrefslogtreecommitdiffstats
path: root/res/res_odbc.c
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-12 00:17:26 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-12 00:17:26 +0000
commit7b0ce5ebecbce6ef25862a092eaee89a62189773 (patch)
tree0f798d57ffba5b4327e52f8b8ac85be7a325625c /res/res_odbc.c
parent397f60215926502ce687304b0df0894df77f2520 (diff)
Merged revisions 98467 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r98467 | tilghman | 2008-01-11 18:05:08 -0600 (Fri, 11 Jan 2008) | 4 lines Add a connection timeout attribute, as that was what was intended with the login timeout, but ODBC divides it up into 2 different timeouts. (Closes issue #11745) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@98487 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_odbc.c')
-rw-r--r--res/res_odbc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/res/res_odbc.c b/res/res_odbc.c
index 391a20371..c35a4319f 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -550,6 +550,7 @@ static odbc_status odbc_obj_connect(struct odbc_obj *obj)
return ODBC_FAIL;
}
SQLSetConnectAttr(obj->con, SQL_LOGIN_TIMEOUT, (SQLPOINTER *) 10, 0);
+ SQLSetConnectAttr(obj->con, SQL_ATTR_CONNECTION_TIMEOUT, (SQLPOINTER *) 10, 0);
#ifdef NEEDTRACE
SQLSetConnectAttr(obj->con, SQL_ATTR_TRACE, &enable, SQL_IS_INTEGER);
SQLSetConnectAttr(obj->con, SQL_ATTR_TRACEFILE, tracefile, strlen(tracefile));