# HG changeset patch
# User Chad Peckham <chad.peckham@nokia.com>
# Date 1250018604 18000
# Node ID 491ffdbbc5b5bf1c078df6ee60d5287cc5c957cd
# Parent  d40ec9228b9cc336524d13049423014ba65fc236
Merge from 2.2 branch

diff -r d40ec9228b9c -r 491ffdbbc5b5 connectivity/com.nokia.tcf/native/TCFNative/TCFCommTCP/TcpComm.cpp
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFCommTCP/TcpComm.cpp	Tue Aug 11 10:38:58 2009 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFCommTCP/TcpComm.cpp	Tue Aug 11 14:23:24 2009 -0500
@@ -152,7 +152,7 @@
 			{
 				int i = SO_MAX_MSG_SIZE;
 				// set socket options
-				BOOL keepAlive = FALSE;
+				BOOL keepAlive = TRUE;
 				setsockopt(m_socket, SOL_SOCKET, SO_KEEPALIVE, (const char*)&keepAlive, sizeof(BOOL));
 
 				struct linger l;