change default setting for autofallthrough

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41475 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/UPGRADE.txt b/UPGRADE.txt
index b47bcbacdd3a051ef39ad74c4fab8995bbf02887..9a75748a877bab393212277c91457dfff31116c5 100644 (file)
--- 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 f45a39df3abec63d5b8603e71dc097ad4c3779f4..5da6aa978098122f4f7ab53be0ff4c693275ae84 100644 (file)
--- 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 522da6f64bf91a4a1bbcb833da4ce4afa0f79314..039d7beb3a6be37a43a1861a11d9673fc7773ec3 100644 (file)
--- 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;