[svn-commits] mjordan: branch 12 r418714 - in /branches/12: ./ main/manager.c

[SVN commits to the Digium repositories]

Author: mjordan
Date: Tue Jul 15 17:20:54 2014
New Revision: 418714

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418714
Log:
manager: Return ActionID on nominal responses to PresenceState action

When the PresenceState action is executed, the nominal path fails to include
the ActionID in the successful response. This patch adds a call to
astman_start_ack, which guarantees that an ActionID (if provided) will be
sent back to the AMI client.

Review: https://reviewboard.asterisk.org/r/3776/

ASTERISK-23985 #close
........

Merged revisions 418713 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/main/manager.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/manager.c?view=diff&rev=418714&r1=418713&r2=418714
==============================================================================
--- branches/12/main/manager.c (original)
+++ branches/12/main/manager.c Tue Jul 15 17:20:54 2014
@@ -5043,6 +5043,7 @@
 				"Message: %s\r\n", message);
 	}
 
+	astman_start_ack(s, m);
 	astman_append(s, "Message: Presence State\r\n"
 			"State: %s\r\n"
 			"%s"