Merged revisions 287193 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r287193 | russell | 2010-09-16 16:57:51 -0500 (Thu, 16 Sep 2010) | 4 lines

  Set the default for "autofill" and "shared_lastcall" to "yes" in queues.conf.

  Review: https://reviewboard.asterisk.org/r/922/
........

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

diff --git a/UPGRADE-1.8.txt b/UPGRADE-1.8.txt
index 9889a55..da13625 100644 (file)
--- a/UPGRADE-1.8.txt
+++ b/UPGRADE-1.8.txt
@@ -20,6 +20,9 @@
 
 From 1.6.2 to 1.8:
 
+* The default value for 'autofill' and 'shared_lastcall' in queues.conf has
+  been changed to 'yes'.
+
 * The default value for the alwaysauthreject option in sip.conf has been changed
   from "no" to "yes".
 

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 57cbc0b..07161d5 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -760,13 +760,13 @@ static int queue_persistent_members = 0;
 static int use_weight = 0;
 
 /*! \brief queues.conf [general] option */
-static int autofill_default = 0;
+static int autofill_default = 1;
 
 /*! \brief queues.conf [general] option */
 static int montype_default = 0;
 
 /*! \brief queues.conf [general] option */
-static int shared_lastcall = 0;
+static int shared_lastcall = 1;
 
 /*! \brief Subscription to device state change events */
 static struct ast_event_sub *device_state_sub;

diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample
index f6c3a76..b251323 100644 (file)
--- a/configs/queues.conf.sample
+++ b/configs/queues.conf.sample
@@ -10,7 +10,7 @@
 persistentmembers = yes
 ;
 ; AutoFill Behavior
-;    The old/current behavior of the queue has a serial type behavior
+;    The old behavior of the queue (autofill=no) is to have a serial type behavior
 ;    in that the queue will make all waiting callers wait in the queue
 ;    even if there is more than one available member ready to take
 ;    calls until the head caller is connected with the member they
@@ -23,10 +23,9 @@ persistentmembers = yes
 ;    no more available members or no more waiting callers. This is
 ;    probably more along the lines of how a queue should work and
 ;    in most cases, you will want to enable this behavior. If you
-;    do not specify or comment out this option, it will default to no
-;    to keep backward compatibility with the old behavior.
+;    do not specify or comment out this option, it will default to yes.
 ;
-autofill = yes
+;autofill = no
 ;
 ; Monitor Type
 ;    By setting monitor-type = MixMonitor, when specifying monitor-format
@@ -56,11 +55,11 @@ monitor-type = MixMonitor
 ; example: Queue(dave,t,,,45)
 
 ; shared_lastcall will make the lastcall and calls received be the same in
-; members logged in more than one queue.
-; This is useful to make the queue respect the wrapuptime of another queue
-; for a shared member
+; members logged in more than one queue.  This is useful to make the queue
+; respect the wrapuptime of another queue for a shared member.
+; The default value is yes.
 ;
-shared_lastcall=no
+;shared_lastcall=no
 ;
 ;[markq]
 ;