[asterisk-commits] murf: branch 1.6.1 r178988 - in /branches/1.6.1: ./ configs/ main/

[SVN commits to the Asterisk project]

Author: murf
Date: Thu Feb 26 21:56:58 2009
New Revision: 178988

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=178988
Log:
Merged revisions 178986 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r178986 | murf | 2009-02-26 20:45:58 -0700 (Thu, 26 Feb 2009) | 26 lines
  
  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!
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/configs/features.conf.sample
    branches/1.6.1/main/features.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/configs/features.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/configs/features.conf.sample?view=diff&rev=178988&r1=178987&r2=178988
==============================================================================
--- branches/1.6.1/configs/features.conf.sample (original)
+++ branches/1.6.1/configs/features.conf.sample Thu Feb 26 21:56:58 2009
@@ -39,8 +39,8 @@
 ;xfersound = beep		; to indicate an attended transfer is complete
 ;xferfailsound = beeperr	; to indicate a failed transfer
 ;pickupexten = *8		; Configure the pickup extension. (default is *8)
-;featuredigittimeout = 500	; Max time (ms) between digits for 
-				; feature activation  (default is 500 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

Modified: branches/1.6.1/main/features.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/features.c?view=diff&rev=178988&r1=178987&r2=178988
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Thu Feb 26 21:56:58 2009
@@ -58,7 +58,7 @@
 
 #define DEFAULT_PARK_TIME 45000
 #define DEFAULT_TRANSFER_DIGIT_TIMEOUT 3000
-#define DEFAULT_FEATURE_DIGIT_TIMEOUT 500
+#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