diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-22 15:46:49 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-22 15:46:49 +0000 |
| commit | 759d61063008b6124ce33ffb6b71a7b3670c0595 (patch) | |
| tree | a9479848384f28a087f625c89561f5b45e639f60 /main/manager.c | |
| parent | 801dd8bfd74e4d3159622ff686ae33e5a3e3724d (diff) | |
Merged revisions 114527 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r114527 | russell | 2008-04-22 10:46:01 -0500 (Tue, 22 Apr 2008) | 8 lines
Correct action_ping() and action_events() with regards to Manager 1.1
documentation. Also, fix a bug in xml_translate().
(closes issue #11649)
Reported by: ys
Patches:
trunk_manager.c.diff uploaded by ys (license 281)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114528 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/manager.c')
| -rw-r--r-- | main/manager.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/main/manager.c b/main/manager.c index 5d96ac8dd..ea47c7e00 100644 --- a/main/manager.c +++ b/main/manager.c @@ -1063,7 +1063,8 @@ static char mandescr_ping[] = static int action_ping(struct mansession *s, const struct message *m) { - astman_send_response(s, m, "Success", "Ping: Pong\r\n"); + astman_append(s, "Response: Success\r\n" + "Ping: Pong\r\n"); return 0; } @@ -1575,10 +1576,11 @@ static int action_events(struct mansession *s, const struct message *m) res = set_eventmask(s, mask); if (res > 0) - astman_send_response(s, m, "Success", "Events: On\r\n"); + astman_append(s, "Response: Success\r\n" + "Events: On\r\n"); else if (res == 0) - astman_send_response(s, m, "Success", "Events: Off\r\n"); - + astman_append(s, "Response: Success\r\n" + "Events: Off\r\n"); return 0; } @@ -3362,11 +3364,13 @@ static void xml_translate(struct ast_str **out, char *in, struct ast_variable *v ast_str_append(out, 0, xml ? "'" : "</td></tr>\n"); in_data = 0; } - ast_str_append(out, 0, xml ? " /></response>\n" : - "<tr><td colspan=\"2\"><hr></td></tr>\r\n"); - inobj = 0; - ao2_ref(vco, -1); - vco = NULL; + if (inobj) { + ast_str_append(out, 0, xml ? " /></response>\n" : + "<tr><td colspan=\"2\"><hr></td></tr>\r\n"); + inobj = 0; + ao2_ref(vco, -1); + vco = NULL; + } continue; } |