Patch to use configured connection timeout

Jan Blom <[email protected]>
Newsgroups gmane.comp.db.tds.freetds
Message-ID <DB3PR05MB42810954C8CFB3652051FFBEE6B0@DB3PR05MB428.eurprd05.prod.outlook.com>
Hello,

Using FreeTDS 0.95 in combination with unixODBC I notice that the connection timeout value configured in freetds.conf is never used when calling SQLDriverConnect. The attached patch makes us use the value from freetds.conf if we don't call SQLSetConnectAttr with SQL_ATTR_CONNECTION_TIMEOUT.

The change is rather trivial. Let me know if you want me to produce a patch against head. Looking at the 1.0RC1 code it seems the issue is still present. 


Best regards,
Jan Blom

_______________________________________________
FreeTDS mailing list
[email protected]
http://lists.ibiblio.org/mailman/listinfo/freetds
connect_timeout_patch.txt (text/plain, 493 B)
--- freetds-0.95.81/src/odbc/odbc.c	2015-10-15 11:00:01.000000000 +0200
+++ freetds-0.95.81_patched/src/odbc/odbc.c	2016-04-18 22:08:50.692892606 +0200
@@ -379,7 +379,11 @@
 
 	tds_fix_login(login);
 
-	login->connect_timeout = dbc->attr.connection_timeout;
+	/* use connection timeout if set */
+	if (dbc->attr.connection_timeout != 0) {
+		login->connect_timeout = dbc->attr.connection_timeout;
+	}
+
 	if (dbc->attr.mars_enabled != SQL_MARS_ENABLED_NO)
 		login->mars = 1;
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.