[svn-commits] pabelanger: trunk r279727 - in /trunk: ./ main/http.c

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Mon Jul 26 20:56:30 2010
New Revision: 279727

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

Modified:
    trunk/   (props changed)
    trunk/main/http.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.8-merged (original)
+++ branch-1.8-merged Mon Jul 26 20:56:30 2010
@@ -1,1 +1,1 @@
-/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390,279410,279442,279472,279502,279504,279562,279566,279568,279598,279601,279619,279658,279689
+/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390,279410,279442,279472,279502,279504,279562,279566,279568,279598,279601,279619,279658,279689,279726

Modified: trunk/main/http.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/http.c?view=diff&rev=279727&r1=279726&r2=279727
==============================================================================
--- trunk/main/http.c (original)
+++ trunk/main/http.c Mon Jul 26 20:56:30 2010
@@ -1078,8 +1078,8 @@
 		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));