[prev in list] [next in list] [prev in thread] [next in thread]
List: asterisk-commits
Subject: [asterisk-commits] lmadsen: branch 1.6.0 r255507 - in
From: SVN commits to the Asterisk project <asterisk-commits () lists ! digium ! com>
Date: 2010-03-31 17:54:15
Message-ID: E1Nx27L-0000aA-Ro () wibble ! digium ! internal
[Download RAW message or body]
Author: lmadsen
Date: Wed Mar 31 12:54:13 2010
New Revision: 255507
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=255507
Log:
Merged revisions 255504 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r255504 | lmadsen | 2010-03-31 12:48:09 -0500 (Wed, 31 Mar 2010) | 5 lines
Add documentation clarifying when 't' and 'T' can be used.
(closes issue #17021)
Reported by: kovzol
Tested by: lmadsen, kovzol, davidw, ebroad
........
Modified:
branches/1.6.0/apps/app_dial.c
branches/1.6.0/configs/sip.conf.sample
Modified: branches/1.6.0/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/apps/app_dial.c?view=diff&rev=255507&r1=255506&r2=255507
==============================================================================
--- branches/1.6.0/apps/app_dial.c (original)
+++ branches/1.6.0/apps/app_dial.c Wed Mar 31 12:54:13 2010
@@ -198,10 +198,12 @@
" answered the call.\n"
" t - Allow the called party to transfer the calling party by sending the\n"
" DTMF sequence defined in the blindxfer setting in the featuremap \
section\n"
-" of features.conf.\n"
+" of features.conf. This setting does not perform policy enforcement on\n"
+" transfers initiated by other methods.\n"
" T - Allow the calling party to transfer the called party by sending the\n"
" DTMF sequence defined in the blindxfer setting in the featuremap \
section\n"
-" of features.conf.\n"
+" of features.conf. This setting does not perform policy enforcement on\n"
+" transfers initiated by other methods.\n"
" U(x[^arg]) - Execute via Gosub the routine 'x' for the *called* channel before \
connecting\n" " to the calling channel. Arguments can be specified to the \
Gosub\n" " using '^' as a delimeter. The Gosub routine can set the \
variable\n"
Modified: branches/1.6.0/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/configs/sip.conf.sample?view=diff&rev=255507&r1=255506&r2=255507
==============================================================================
--- branches/1.6.0/configs/sip.conf.sample (original)
+++ branches/1.6.0/configs/sip.conf.sample Wed Mar 31 12:54:13 2010
@@ -88,7 +88,8 @@
; instead of the From: field.
allowoverlap=no ; Disable overlap dialing support. (Default is yes)
;allowtransfer=no ; Disable all transfers (unless enabled in peers or \
users)
- ; Default is enabled
+ ; Default is enabled. The Dial() options 't' and 'T' \
are not + ; related as to whether SIP transfers are \
allowed or not. ;realm=mydomain.tld ; Realm for digest authentication
; defaults to "asterisk". If you set a system name \
in
; asterisk.conf, it defaults to that system name
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
asterisk-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/asterisk-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic