diff options
| author | phsultan <phsultan@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-17 13:55:10 +0000 |
|---|---|---|
| committer | phsultan <phsultan@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-17 13:55:10 +0000 |
| commit | e2b3a05e1c50199186817f2c1f793d874eb5c475 (patch) | |
| tree | d906e7e43d9ec7972a8856fa07c99d33ae4c90d8 /res | |
| parent | 7dc54efa24a8996076e1c6615d1b92b58251daed (diff) | |
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.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114200 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_jabber.c | 2 |
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 |