kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-23 14:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41258 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-08-28 21:02:56 +00:00
parent 53a30e84eb
commit a37739a0d9
2 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_macro.c
View File

@@ -246,7 +246,7 @@ static int macro_exec(struct ast_channel *chan, void *data)
break;
}
/* don't stop executing extensions when we're in "h" */
if (chan->_softhangup && strcasecmp(chan->macroexten,"h")) {
if (chan->_softhangup && strcasecmp(oldexten,"h") && strcasecmp(chan->macroexten,"h")) {
ast_log(LOG_DEBUG, "Extension %s, macroexten %s, priority %d returned normally even though call was hung up\n",
chan->exten, chan->macroexten, chan->priority);
goto out;

24
doc/README.variables
View File

@@ -227,13 +227,6 @@ with equal precedence are grouped within { } symbols.
This, the unary minus operator, is right associative, and
has the same precedence as the ! operator.
! expr1
Return the result of a logical complement of expr1.
In other words, if expr1 is null, 0, an empty string,
or the string "0", return a 1. Otherwise, return a 0.
It has the same precedence as the unary minus operator, and
is also right associative.
expr1 : expr2
The `:' operator matches expr1 against expr2, which must be a
regular expression. The regular expression is anchored to the
@@ -251,12 +244,6 @@ with equal precedence are grouped within { } symbols.
before the regex match is made, beginning and ending double quote
characters are stripped from both the pattern and the string.
expr1 =~ expr2
Exactly the same as the ':' operator, except that the match is
not anchored to the beginning of the string. Pardon any similarity
to seemingly similar operators in other programming languages!
The ":" and "=~" operators share the same precedence.
expr1 ? expr2 :: expr3
Traditional Conditional operator. If expr1 is a number
that evaluates to 0 (false), expr3 is result of the this
@@ -276,12 +263,6 @@ or C derived languages.
Examples
"One Thousand Five Hundred" =~ "(T[^ ]+)"
returns: Thousand
"One Thousand Five Hundred" =~ "T[^ ]+"
returns: 8
"One Thousand Five Hundred" : "T[^ ]+"
returns: 0
@@ -291,11 +272,6 @@ Examples
"3075551212":"...(...)"
returns: 555
! "One Thousand Five Hundred" =~ "T[^ ]+"
returns: 0 (because it applies to the string, which is non-null,
which it turns to "0", and then looks for the pattern
in the "0", and doesn't find it)
!( "One Thousand Five Hundred" : "T[^ ]+" )
returns: 1 (because the string doesn't start with a word starting
with T, so the match evals to 0, and the ! operator