Skip to content
Snippets Groups Projects
Commit 8e7dd42f authored by Automerge script's avatar Automerge script
Browse files

Merged revisions 376691 via svnmerge from

file:///srv/subversion/repos/asterisk/trunk

................
  r376691 | rmudgett | 2012-11-27 18:13:10 -0600 (Tue, 27 Nov 2012) | 39 lines
  
  Fix extension matching with the '-' char.
  
  The '-' char is supposed to be ignored by the dialplan extension matching.
  Unfortunately, it's treatment is not handled consistently throughout the
  extension matching code.
  
  * Made the old exten matching code consistently ignore '-' chars.
  
  * Made the old exten matching code consistently handle case in the
  matching.
  
  * Made ignore empty character sets.
  
  * Fixed ast_extension_cmp() to return -1, 0, or 1 as documented.  The only
  user of it in pbx_lua.c was testing for -1.  It was originally returning
  the strcmp() value for less than which is not usually going to be -1.
  
  * Fix character set sorting if the sets have the same number of characters
  and start with the same character.  Character set [0-9] now sorts before
  [02-9a] as originally intended.
  
  * Updated some extension label and priority already in use warnings to
  also indicate if the extension is aliased.
  
  (closes issue ASTERISK-19205)
  Reported by: Philippe Lindheimer, Birger "WIMPy" Harzenetter
  Tested by: rmudgett
  
  Review: https://reviewboard.asterisk.org/r/2201/
  ........
  
  Merged revisions 376688 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........
  
  Merged revisions 376689 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........
  
  Merged revisions 376690 from http://svn.asterisk.org/svn/asterisk/branches/11
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@376698 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent a8255762
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment