[asterisk-commits] phsultan: branch 1.6.0 r114200 - in /branches/1.6.0: ./ res/res_jabber.c

[SVN commits to the Asterisk project]

Author: phsultan
Date: Thu Apr 17 08:55:10 2008
New Revision: 114200

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114200
Log:
Merged revisions 114199 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r114199 | phsultan | 2008-04-17 15:46:17 +0200 (Thu, 17 Apr 2008) | 10 lines

Merged revisions 114198 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114198 | phsultan | 2008-04-17 15:42:23 +0200 (Thu, 17 Apr 2008) | 2 lines

Use keepalives effectively in order diagnose bug #12432.

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/res/res_jabber.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/res/res_jabber.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/res/res_jabber.c?view=diff&rev=114200&r1=114199&r2=114200
==============================================================================
--- branches/1.6.0/res/res_jabber.c (original)
+++ branches/1.6.0/res/res_jabber.c Thu Apr 17 08:55:10 2008
@@ -1889,7 +1889,7 @@
 		else if (res == IKS_NET_TLSFAIL)
 			ast_log(LOG_WARNING, "JABBER:  Failure in TLS.\n");
 		else if (client->timeout == 0 && client->state == AJI_CONNECTED) {
-			res = aji_send_raw(client, " ");
+			res = client->keepalive ? aji_send_raw(client, " ") : IKS_OK;
 			if(res == IKS_OK)
 				client->timeout = 50;
 			else