From 0f4489dc0f76b92d95592cc0b726cb98f781881e Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Thu, 2 Feb 2012 18:55:05 +0000 Subject: Fix TLS port binding behavior as well as reload behavior: * Removes references to tlsbindport from http.conf.sample and manager.conf.sample * Properly bind to port specified in tlsbindaddr, using the default port if specified. * On a reload, properly close socket if the service has been disabled. A note has been added to UPGRADE.txt to indicate how ports must be set for TLS. (closes issue ASTERISK-16959) reported by Olaf Holthausen (closes issue ASTERISK-19201) reported by Chris Mylonas (closes issue ASTERISK-19204) reported by Chris Mylonas Review: https://reviewboard.asterisk.org/r/1709 ........ Merged revisions 353770 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 353820 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@353821 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/manager.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/asterisk') diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h index eaf48cecf..534e43f90 100644 --- a/include/asterisk/manager.h +++ b/include/asterisk/manager.h @@ -56,6 +56,7 @@ #define AMI_VERSION "1.2" #define DEFAULT_MANAGER_PORT 5038 /* Default port for Asterisk management via TCP */ +#define DEFAULT_MANAGER_TLS_PORT 5039 /* Default port for Asterisk management via TCP */ /*! \name Constant return values *\note Currently, returning anything other than zero causes the session to terminate. -- cgit v1.2.3