[asterisk-commits] russell: trunk r283628 - in /trunk: ./ configs/manager.conf.sample

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Aug 26 07:26:46 2010
New Revision: 283628

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=283628
Log:
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.
........

Modified:
    trunk/   (props changed)
    trunk/configs/manager.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/configs/manager.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/manager.conf.sample?view=diff&rev=283628&r1=283627&r2=283628
==============================================================================
--- trunk/configs/manager.conf.sample (original)
+++ trunk/configs/manager.conf.sample Thu Aug 26 07:26:46 2010
@@ -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
-
 bindaddr = 0.0.0.0
 
 ; Parameters that control AMI over TLS. ("enabled" must be set too).
@@ -69,6 +62,15 @@
 
 ; 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