Asterisk Guru

AsteriskGuru Archives
Mailing List Archives

FAQ

Memberlist

Usergroups

Profile

[svn-commits] seanbright: branch 1.6.2 r198374 - in /branche

AsteriskGuru Archives Forum Index -> Asterisk-CVS

View previous topic :: View next topic

Author

Message

svn-commits at lists.digi
Guest

Posted: Sat May 30, 2009 6:45 pm Post subject: [svn-commits] seanbright: branch 1.6.2 r198374 - in /branche

Author: seanbright Date: Sat May 30 14:41:30 2009 New Revision: 198374 URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=198374 Log: Merged revisions 198371 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r198371 \| seanbright \| 2009-05-30 15:38:58 -0400 (Sat, 30 May 2009) \| 19 lines Merged revisions 198370 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r198370 \| seanbright \| 2009-05-30 15:36:20 -0400 (Sat, 30 May 2009) \| 12 lines Properly terminate AMI JabberSend response messages. The response message (either Error or Success) needs an extra trailing \r\n after the fields to inform the client that the message is complete. (closes issue #14876) Reported by: srt Patches: 05302009_1.4_res_jabber.c.diff uploaded by seanbright (license 71) asterisk_14876.patch uploaded by srt (license 378) trunk-14876-2.diff uploaded by phsultan (license 73) ........ ................ Modified: branches/1.6.2/ (props changed) branches/1.6.2/res/res_jabber.c Propchange: branches/1.6.2/ ------------------------------------------------------------------------------ Binary property 'trunk-merged' - no diff available. Modified: branches/1.6.2/res/res_jabber.c URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/res/res_jabber.c?view=diff&rev=198374&r1=198373&r2=198374 ============================================================================== --- branches/1.6.2/res/res_jabber.c (original) +++ branches/1.6.2/res/res_jabber.c Sat May 30 14:41:30 2009 @@ -3011,17 +3011,17 @@ if (!client) { astman_send_error(s, m, "Could not find Sender"); return 0; - } - if (strchr(screenname, '@') && message){ - ast_aji_send_chat(client, screenname, message); + } + if (strchr(screenname, '@') && message) { + ast_aji_send_chat(client, screenname, message); astman_append(s, "Response: Success\r\n"); - if (!ast_strlen_zero(id)) - astman_append(s, "ActionID: %s\r\n",id); - return 0; - } - astman_append(s, "Response: Error\r\n"); - if (!ast_strlen_zero(id)) + } else { + astman_append(s, "Response: Error\r\n"); + } + if (!ast_strlen_zero(id)) { astman_append(s, "ActionID: %s\r\n",id); + } + astman_append(s, "\r\n"); return 0; } _______________________________________________ --Bandwidth and Colocation Provided by http://www.api-digital.com-- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits

Display posts from previous:

AsteriskGuru Archives Forum Index -> Asterisk-CVS	All times are GMT
Page 1 of 1

You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum