diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-10-04 23:23:57 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-10-04 23:23:57 +0000 |
| commit | bddb242d72a2bc8f0dce5fec6d7caeb3f52e2e1b (patch) | |
| tree | b8a532727ddd874dc0b54246f05e9603d98b193e /main | |
| parent | a00aa10f8cdfc1dab5bc4cca202755e88eee7035 (diff) | |
Merged revisions 290255 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r290255 | tilghman | 2010-10-04 18:23:11 -0500 (Mon, 04 Oct 2010) | 18 lines
Merged revisions 290254 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r290254 | tilghman | 2010-10-04 18:14:59 -0500 (Mon, 04 Oct 2010) | 11 lines
Change new pattern matcher to regard dashes the same as the old pattern matcher -- as visual candy to be ignored.
Also change the AEL parser to not generate dashes within extensions, as those
dashes would be ignored. Update the AEL tests to match this behavior.
(closes issue #17366)
Reported by: murf
Patches:
20100727__issue17366.diff.txt uploaded by tilghman (license 14)
Tested by: tilghman
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@290256 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/pbx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/pbx.c b/main/pbx.c index 4251d1207..9b44306bf 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -2006,6 +2006,10 @@ static struct match_char *add_exten_to_pattern_tree(struct ast_context *con, str qsort(buf, specif, 1, compare_char); specif <<= 8; specif += buf[0]; + } else if (*s1 == '-') { + /* Skip dashes in patterns */ + s1++; + continue; } else { if (*s1 == '\\') { s1++; |