[asterisk-commits] murf: branch 1.6.0 r112359 - in /branches/1.6.0: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: murf
Date: Tue Apr  1 17:48:06 2008
New Revision: 112359

URL: http://svn.digium.com/view/asterisk?view=rev&rev=112359
Log:
Merged revisions 112357 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r112357 | murf | 2008-04-01 16:45:10 -0600 (Tue, 01 Apr 2008) | 1 line

Bumped across another test set for the new exten pattern matcher, which revealed a problem with the CANMATCH/MATCHMORE modes. Direct matches were getting in the way. Fixed.
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/pbx.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/pbx.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/pbx.c?view=diff&rev=112359&r1=112358&r2=112359
==============================================================================
--- branches/1.6.0/main/pbx.c (original)
+++ branches/1.6.0/main/pbx.c Tue Apr  1 17:48:06 2008
@@ -1010,9 +1010,11 @@
 			if (p->x[1] == 0 && *str >= '2' && *str <= '9' ) {
 #define NEW_MATCHER_CHK_MATCH	       \
 				if (p->exten && !(*(str+1))) { /* if a shorter pattern matches along the way, might as well report it */ \
-					update_scoreboard(score, length+1, spec+p->specificity, p->exten,0,callerid, p->deleted, p);         \
-					if (!p->deleted)                                                                                     \
-						return; /* the first match, by definition, will be the best, because of the sorted tree */       \
+					if (action == E_MATCH) { /* if in CANMATCH/MATCHMORE, don't let matches get in the way */            \
+						update_scoreboard(score, length+1, spec+p->specificity, p->exten,0,callerid, p->deleted, p);     \
+						if (!p->deleted)								                                                 \
+							return; /* the first match, by definition, will be the best, because of the sorted tree */   \
+					}                                                                                                    \
 				}
 				
 #define NEW_MATCHER_RECURSE	           \