diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-30 21:44:05 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-30 21:44:05 +0000 |
| commit | fbe5134cb57476035671c2fc1dba683f294ba820 (patch) | |
| tree | 0eeef267fb3252ed94787fbc3c303a23d755a8fa | |
| parent | baf54bea3c77e43240576ef56b8bf00b4a4e8246 (diff) | |
change default setting for autofallthrough
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@41475 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | UPGRADE.txt | 5 | ||||
| -rw-r--r-- | configs/extensions.conf.sample | 6 | ||||
| -rw-r--r-- | main/pbx.c | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/UPGRADE.txt b/UPGRADE.txt index b47bcbacd..9a75748a8 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -96,6 +96,11 @@ PBX Core: not set, it uses the transferee variable. If not set in any channel, it will attempt to use the last non macro context. If not possible, it will default to the current context. + +* The autofallthrough setting introduced in Asterisk 1.2 now defaults to 'yes'; + if your dialplan relies on the ability to 'run off the end' of an extension + and wait for a new extension without using WaitExten() to accomplish that, + you will need set autofallthrough to 'no' in your extensions.conf file. Command Line Interface: diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample index f45a39df3..5da6aa978 100644 --- a/configs/extensions.conf.sample +++ b/configs/extensions.conf.sample @@ -27,13 +27,13 @@ writeprotect=no ; ; If autofallthrough is set, then if an extension runs out of ; things to do, it will terminate the call with BUSY, CONGESTION -; or HANGUP depending on Asterisk's best guess (strongly recommended). +; or HANGUP depending on Asterisk's best guess. This is the default. ; ; If autofallthrough is not set, then if an extension runs out of -; things to do, asterisk will wait for a new extension to be dialed +; things to do, Asterisk will wait for a new extension to be dialed ; (this is the original behavior of Asterisk 1.0 and earlier). ; -autofallthrough=yes +;autofallthrough=no ; ; If clearglobalvars is set, global variables will be cleared ; and reparsed on an extensions reload, or Asterisk reload. diff --git a/main/pbx.c b/main/pbx.c index 522da6f64..039d7beb3 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -240,7 +240,7 @@ static int pbx_builtin_importvar(struct ast_channel *, void *); AST_MUTEX_DEFINE_STATIC(globalslock); static struct varshead globals = AST_LIST_HEAD_NOLOCK_INIT_VALUE; -static int autofallthrough = 0; +static int autofallthrough = 1; AST_MUTEX_DEFINE_STATIC(maxcalllock); static int countcalls = 0; |