aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorphsultan <phsultan@f38db490-d61c-443f-a65b-d21fe96a405b>2008-04-17 13:46:17 +0000
committerphsultan <phsultan@f38db490-d61c-443f-a65b-d21fe96a405b>2008-04-17 13:46:17 +0000
commit4196fb6c523e4f1ca017d4e55205b9e4a8f30225 (patch)
tree2663a04643364dbfa7ddece0e3c80d2af4be9c79 /res
parenta7b77f9c821b0818b6b33073654f7a57eb7fbf83 (diff)
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. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@114199 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_jabber.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c
index 5bcf70f3d..d56505af8 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -1889,7 +1889,7 @@ static void *aji_recv_loop(void *data)
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