aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorpabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-27 01:53:38 +0000
committerpabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-27 01:53:38 +0000
commit44af92a6d635bdd3d6043ecd6e56a1a5470952a0 (patch)
tree3d92e0ab715d679e4d23e4dfe02caf54b6c52893 /main
parent10ace2d3173d68589ce539557428b00c9e5e9dee (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.8@279726 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/http.c4
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));