diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-08 22:48:47 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-08 22:48:47 +0000 |
commit | d0b2229ebdf2a6569b092d4adf4ad7a984b2ef15 (patch) | |
tree | 9486a727b8e1260f7df7e56c9f2dbfa10936f2a4 /manager.c | |
parent | 908810e23f7815eccab97be7023a1aed15f89464 (diff) |
merge up to branch 1.2 and re-enable automerge
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@53671 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'manager.c')
-rw-r--r-- | manager.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -773,7 +773,6 @@ static int action_status(struct mansession *s, struct message *m) long elapsed_seconds=0; int all = ast_strlen_zero(name); /* set if we want all channels */ - astman_send_ack(s, m, "Channel status will follow"); if (!ast_strlen_zero(id)) snprintf(idText,256,"ActionID: %s\r\n",id); if (all) @@ -785,6 +784,7 @@ static int action_status(struct mansession *s, struct message *m) return 0; } } + astman_send_ack(s, m, "Channel status will follow"); /* if we look by name, we break after the first iteration */ while(c) { if (c->_bridge) @@ -1077,6 +1077,7 @@ static int action_originate(struct mansession *s, struct message *m) } else { res = 0; } + pthread_attr_destroy(&attr); } } else if (!ast_strlen_zero(app)) { res = ast_pbx_outgoing_app(tech, AST_FORMAT_SLINEAR, data, to, app, appdata, &reason, 1, l, n, vars, account, NULL); |