[asterisk-commits] dbrooks: branch 1.6.1 r218890 - in /branches/1.6.1: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: dbrooks
Date: Wed Sep 16 13:23:15 2009
New Revision: 218890

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=218890
Log:
Merged revisions 218868 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r218868 | dbrooks | 2009-09-16 13:06:42 -0500 (Wed, 16 Sep 2009) | 20 lines
  
  Merged revisions 218867 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r218867 | dbrooks | 2009-09-16 13:00:45 -0500 (Wed, 16 Sep 2009) | 13 lines
    
    Fixes CID pattern matching behavior to mirror that of extension pattern matching.
    
    Pattern matching for extensions uses a type of scoring system, giving values for
    specificity to each character in the pattern. Unfortunately, this is done character
    by character, in order. This does lead to some less specific patterns being first
    in line for matching, but it will usually get the job done.
    
    This patch merely brings CID matching to the same level as extension matching.
    This patch does not attempt to tackle the problem shared by extension matching.
    
    (closes issue #14708)
    Reported by: klaus3000
  ........
................

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

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

Modified: branches/1.6.1/main/pbx.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/pbx.c?view=diff&rev=218890&r1=218889&r2=218890
==============================================================================
--- branches/1.6.1/main/pbx.c (original)
+++ branches/1.6.1/main/pbx.c Wed Sep 16 13:23:15 2009
@@ -7165,7 +7165,7 @@
 			else if (e->matchcid && !tmp->matchcid)
 				res = -1;
 			else
-				res = strcasecmp(e->cidmatch, tmp->cidmatch);
+				res = ext_cmp(e->cidmatch, tmp->cidmatch);
 		}
 		if (res >= 0)
 			break;