From: Russell Bryant Date: Thu, 26 Aug 2010 12:26:46 +0000 (+0000) Subject: Merged revisions 283627 via svnmerge from X-Git-Tag: 11.0.0-beta1~2414 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c48c7123c17b5445caecd556b7604a349afde1b2;p=thirdparty%2Fasterisk.git Merged revisions 283627 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r283627 | russell | 2010-08-26 07:26:22 -0500 (Thu, 26 Aug 2010) | 2 lines Move httptimeout out from in between port and bindaddr. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@283628 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/configs/manager.conf.sample b/configs/manager.conf.sample index bfa13430c7..253a3ffa46 100644 --- a/configs/manager.conf.sample +++ b/configs/manager.conf.sample @@ -23,15 +23,8 @@ [general] enabled = no ;webenabled = yes -port = 5038 - -;httptimeout = 60 -; a) httptimeout sets the Max-Age of the http cookie -; b) httptimeout is the amount of time the webserver waits -; on a action=waitevent request (actually its httptimeout-10) -; c) httptimeout is also the amount of time the webserver keeps -; a http session alive after completing a successful action +port = 5038 bindaddr = 0.0.0.0 ; Parameters that control AMI over TLS. ("enabled" must be set too). @@ -69,6 +62,15 @@ bindaddr = 0.0.0.0 ; debug = on ; enable some debugging info in AMI messages (default off). ; Also accessible through the "manager debug" CLI command. + +;httptimeout = 60 +; a) httptimeout sets the Max-Age of the http cookie +; b) httptimeout is the amount of time the webserver waits +; on a action=waitevent request (actually its httptimeout-10) +; c) httptimeout is also the amount of time the webserver keeps +; a http session alive after completing a successful action + + ;[mark] ;secret = mysecret ;deny=0.0.0.0/0.0.0.0