Merge "http: leverage 'bindaddr' for TLS in http.conf" into 13

This commit is contained in:
Joshua Colp
2016-06-20 12:03:45 -05:00
committed by Gerrit Code Review

View File

@@ -2220,7 +2220,7 @@ static int __ast_http_load(int reload)
* the non-TLS bindaddress here. * the non-TLS bindaddress here.
*/ */
if (ast_sockaddr_isnull(&https_desc.local_address) && http_desc.accept_fd != -1) { if (ast_sockaddr_isnull(&https_desc.local_address) && http_desc.accept_fd != -1) {
ast_sockaddr_copy(&https_desc.local_address, &https_desc.local_address); ast_sockaddr_copy(&https_desc.local_address, &http_desc.local_address);
/* Of course, we can't use the same port though. /* Of course, we can't use the same port though.
* Since no bind address was specified, we just use the * Since no bind address was specified, we just use the
* default TLS port * default TLS port