summaryrefslogtreecommitdiff
path: root/main/http.c
diff options
context:
space:
mode:
authorAlexander Traud <pabstraud@compuserve.com>2016-06-20 15:05:09 +0200
committerAlexander Traud <pabstraud@compuserve.com>2016-06-20 08:10:10 -0500
commit76516bd79d7d9c8cf51b2359c2741db29d5bc54f (patch)
treebe14d51d87e6513a336997701e944fe541f6426f /main/http.c
parent4d52b4c3e5fd726ee4006a1dcca082e778deb9a7 (diff)
http: leverage 'bindaddr' for TLS in http.conf
The internal HTTP/WebSocket server supports both TCP and TLS, which can be activated separately via the file http.conf. The source code intends to re-use the TCP parameter 'bindaddr' for TLS, even if 'tlsbindaddr' is not specified explicitly. This did not work because of a typo. This change resolves this typo. ASTERISK-26126 #close Change-Id: I5efb0409ae12044dfb3495b6b97b6d40a8c9c51f
Diffstat (limited to 'main/http.c')
-rw-r--r--main/http.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/http.c b/main/http.c
index c343cb236..b2b35ff59 100644
--- a/main/http.c
+++ b/main/http.c
@@ -2220,7 +2220,7 @@ static int __ast_http_load(int reload)
* the non-TLS bindaddress here.
*/
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.
* Since no bind address was specified, we just use the
* default TLS port