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

diff --git a/main/http.c b/main/http.c
index 6390297..a99d3b7 100644 (file)
--- 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));