diff options
| author | Paul Belanger <paul.belanger@polybeacon.com> | 2010-07-27 01:56:30 +0000 |
|---|---|---|
| committer | Paul Belanger <paul.belanger@polybeacon.com> | 2010-07-27 01:56:30 +0000 |
| commit | da2a5e5aa942f6159debc61eb5dbc7bb95e1cfa0 (patch) | |
| tree | 5478a459f2843382d4fda2aea14fdebd575dbfca /main/http.c | |
| parent | b54557e72ea62140411d204395f9335705ce79e7 (diff) | |
Merged revisions 279726 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r279726 | pabelanger | 2010-07-26 21:53:38 -0400 (Mon, 26 Jul 2010) | 9 lines
Use ast_sockaddr_setnull() when http is not enabled.
Otherwise, ast_tcptls_server_start() will still start http.
(closes issue #17708)
Reported by: pabelanger
Patches:
http.patch uploaded by pabelanger (license 224)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@279727 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/http.c')
| -rw-r--r-- | main/http.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/http.c b/main/http.c index 6390297e5..a99d3b759 100644 --- a/main/http.c +++ b/main/http.c @@ -1078,8 +1078,8 @@ static int __ast_http_load(int reload) ast_sockaddr_from_sin(&https_desc.local_address, &tmp2); } if (!enabled) { - http_desc.local_address.ss.ss_family = 0; - https_desc.local_address.ss.ss_family = 0; + ast_sockaddr_setnull(&http_desc.local_address); + ast_sockaddr_setnull(&https_desc.local_address); } if (strcmp(prefix, newprefix)) { ast_copy_string(prefix, newprefix, sizeof(prefix)); |