diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-25 16:05:30 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-25 16:05:30 +0000 |
| commit | 8dc3098e2ef41268cb09fbea77ea61bf477fd8b6 (patch) | |
| tree | 60d2fa81f5f333cc878520c59163c92d50ee955a /main/pbx.c | |
| parent | fe8e7fc2494094f5ff6ae6466040b3bd8d6b7301 (diff) | |
Merged revisions 139770 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r139770 | murf | 2008-08-25 09:54:18 -0600 (Mon, 25 Aug 2008) | 17 lines
Merged revisions 139764 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r139764 | murf | 2008-08-25 09:33:14 -0600 (Mon, 25 Aug 2008) | 9 lines
This patch reverts the changes made via 139347, and 139635, as users
are seeing adverse difference.
I will un-close 13251.
Back to the drawing board/ concept/ beginning/ whatever!
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@139778 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/pbx.c')
| -rw-r--r-- | main/pbx.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/main/pbx.c b/main/pbx.c index 91d4408a6..76d6ddb5f 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -3873,10 +3873,7 @@ static int __ast_pbx_run(struct ast_channel *c) ast_log(LOG_WARNING, "Don't know what to do with '%s'\n", c->name); if (res != AST_PBX_KEEPALIVE) ast_softhangup(c, c->hangupcause ? c->hangupcause : AST_CAUSE_NORMAL_CLEARING); -#ifdef HANGUP_EXTEN_EXECUTION_MOVED_TO_res_features if ((res != AST_PBX_KEEPALIVE) && ast_exists_extension(c, c->context, "h", 1, c->cid.cid_num)) { - /* end before h exten was here */ - set_ext_pri(c, "h", 1); while ((res = ast_spawn_extension(c, c->context, c->exten, c->priority, c->cid.cid_num, &found, 1)) == 0) { c->priority++; @@ -3887,7 +3884,6 @@ static int __ast_pbx_run(struct ast_channel *c) ast_verb(2, "Spawn extension (%s, %s, %d) exited non-zero on '%s'\n", c->context, c->exten, c->priority, c->name); } } -#endif ast_set2_flag(c, autoloopflag, AST_FLAG_IN_AUTOLOOP); pbx_destroy(c->pbx); |