diff options
author | Kinsey Moore <kmoore@digium.com> | 2011-09-20 21:05:42 +0000 |
---|---|---|
committer | Kinsey Moore <kmoore@digium.com> | 2011-09-20 21:05:42 +0000 |
commit | 486b6042f39664bd8f325e8a0b035f80b2a9765d (patch) | |
tree | d53f4ea1fd51c5a8d84cebaae378a046420e3d4a /main/pbx.c | |
parent | 7fe331fd59936d7993572ff40e1c79859f795c6b (diff) |
Merged revisions 337062 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r337062 | kmoore | 2011-09-20 16:05:01 -0500 (Tue, 20 Sep 2011) | 18 lines
Merged revisions 337061 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r337061 | kmoore | 2011-09-20 16:04:11 -0500 (Tue, 20 Sep 2011) | 11 lines
Make CANMATCH with the new pattern match engine behave more like the old one
When checking an extension for E_CANMATCH using the new extension matching
algorithm, an exact match was not returned as a possible match resulting in the
queue failing to allow a caller to exit on DTMF. This removes the requirement
that an extension be longer than acquired digits for an E_CANMATCH operation
to succeed.
(closes issue ASTERISK-18044)
Review: https://reviewboard.asterisk.org/r/1367/
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337063 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/pbx.c')
-rw-r--r-- | main/pbx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index e67458b65..d790f0656 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -1873,7 +1873,7 @@ static void new_find_extension(const char *str, struct scoreboard *score, struct return; /* the first match is all we need */ \ } \ } \ - } else if (p->next_char && !*(str + 1)) { \ + } else if ((p->next_char || action == E_CANMATCH) && !*(str + 1)) { \ score->canmatch = 1; \ score->canmatch_exten = get_canmatch_exten(p); \ if (action == E_CANMATCH || action == E_MATCHMORE) { \ |