aboutsummaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authormnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-13 19:44:49 +0000
committermnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-13 19:44:49 +0000
commit09d31bf391547639229cd4648e81227da1e3c460 (patch)
tree80954de686f886ac94075f69149264a5a7b9b28f /configs
parent11a8503e469e952ff1796956d667db07338e59b9 (diff)
Merged revisions 257146 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r257146 | mnicholson | 2010-04-13 13:10:30 -0500 (Tue, 13 Apr 2010) | 16 lines Merged revisions 257070 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r257070 | mnicholson | 2010-04-13 11:46:30 -0500 (Tue, 13 Apr 2010) | 9 lines Add an option to restore past broken behavor of the Events manager action Before r238915, certain values for the EventMask parameter of the Events action would result in no response being returned. This patch adds an option to restore that broken behavior. Also while fixing this bug I discovered that passing an empty EventMasks parameter would also result in no response being returned, this has been fixed as well while being preserved when the broken behavior is requested. (closes issue #17023) Reported by: nblasgen Review: https://reviewboard.asterisk.org/r/602/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@257218 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r--configs/manager.conf.sample4
1 files changed, 4 insertions, 0 deletions
diff --git a/configs/manager.conf.sample b/configs/manager.conf.sample
index 0fd4ccbaa..79c1ba82e 100644
--- a/configs/manager.conf.sample
+++ b/configs/manager.conf.sample
@@ -56,6 +56,10 @@ bindaddr = 0.0.0.0
;
;timestampevents = yes
+;brokeneventsaction = yes ; Restore previous behavior that caused the events
+ ; action to not return a response in certain
+ ; circumstances. Defaults to 'no'.
+
; debug = on ; enable some debugging info in AMI messages (default off).
; Also accessible through the "manager debug" CLI command.
;[mark]