Merged revisions 178956 via svnmerge from

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

In this case, it's just a matter of reducing the default timeouts from 2000
to 1000 msec, as the max def feature digit timeout is no longer halved.

........
  r178956 | murf | 2009-02-26 14:27:32 -0700 (Thu, 26 Feb 2009) | 18 lines

  This change moves the default feature digit timeout to 1000 ms from the previous default of 500.

  As per bug 14515, a dev discussion arrived at a "mediated concensus"
  of a default feature digit timeout of 1.0 sec. Some voted for 1300;
  ctooley thought 1500 for distracted phone users in phone booths;
  kpfleming put his foot down at 1.0 sec.

  Users who found the previous default max delay of 250 msec perfect,
  are welcome to override the new default. Notice that I said that
  250 msec was the default; wait a minute, you might say, the config
  file said it was 500 msec!; well, because of the bug fix for 14515,
  we found that 500 msec was actually enforcing a max of 250. The bug
  fix would restore 500 msec, but we felt even that was a bit tight
  for most users... 2000 msec was pushed earlier by mmichelson, so
  that reduces to 1000 msec after the bug fix. Enjoy!
........

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

diff --git a/configs/features.conf.sample b/configs/features.conf.sample
index 0a621c3ac9c567a8af4352938cda04c78a49d493..2135d5a087ec3d48859b256f06e31ad2d2db966d 100644 (file)
--- a/configs/features.conf.sample
+++ b/configs/features.conf.sample
@@ -41,8 +41,8 @@ context => parkedcalls                ; Which context parked calls are in (default parking lot
 ;pickupexten = *8              ; Configure the pickup extension. (default is *8)
 ;pickupsound = beep            ; to indicate a successful pickup (default: no sound)
 ;pickupfailsound = beeperr     ; to indicate that the pickup failed (default: no sound)
-;featuredigittimeout = 2000    ; Max time (ms) between digits for 
-                               ; feature activation  (default is 2000 ms)
+;featuredigittimeout = 1000    ; Max time (ms) between digits for 
+                            ; feature activation  (default is 1000 ms)
 ;atxfernoanswertimeout = 15 ; Timeout for answer on attended transfer default is 15 seconds.
 ;atxferdropcall = no        ; If someone does an attended transfer, then hangs up before the transferred
                             ; caller is connected, then by default, the system will try to call back the

diff --git a/main/features.c b/main/features.c
index cbb49f19ab14f2f2d3a2419a9c48622ccf9496c9..d259a31b317dfba1c794ae8ac9756c4491ba2d75 100644 (file)
--- a/main/features.c
+++ b/main/features.c
@@ -158,7 +158,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #define DEFAULT_PARK_TIME 45000
 #define DEFAULT_TRANSFER_DIGIT_TIMEOUT 3000
-#define DEFAULT_FEATURE_DIGIT_TIMEOUT 2000
+#define DEFAULT_FEATURE_DIGIT_TIMEOUT 1000
 #define DEFAULT_NOANSWER_TIMEOUT_ATTENDED_TRANSFER 15000
 #define DEFAULT_PARKINGLOT "default"                   /*!< Default parking lot */
 #define DEFAULT_ATXFER_DROP_CALL 0