diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-04 23:14:59 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-04 23:14:59 +0000 |
| commit | 27a7cb2f59dc8934c7899e887aff68bac223e469 (patch) | |
| tree | 68a05e9085aeba07e31d82072b478337b51d78b4 /main | |
| parent | 97f5d333487f00f45efaddd3040877e4f186d9c4 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@290254 f38db490-d61c-443f-a65b-d21fe96a405b
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 7a2e0eb4b..62c9d8d2f 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -1947,6 +1947,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 == '\\') { |