kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-23 14:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "http.c: Reload TLS even if http.conf hasn't changed"

Browse Source
This commit is contained in:
George Joseph
2018-10-04 07:23:49 -05:00
committed by Gerrit Code Review
parent 1a6e97bf23 286339aa34
commit f55e20ae83
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/http.c
View File

@@ -2066,7 +2066,15 @@ static int __ast_http_load(int reload)
int http_tls_was_enabled = 0; int http_tls_was_enabled = 0;
cfg = ast_config_load2("http.conf", "http", config_flags); cfg = ast_config_load2("http.conf", "http", config_flags);
if (!cfg || cfg == CONFIG_STATUS_FILEUNCHANGED || cfg == CONFIG_STATUS_FILEINVALID) { if (!cfg || cfg == CONFIG_STATUS_FILEINVALID) {
return 0;
}
/* Even if the http.conf hasn't been updated, the TLS certs/keys may have been */
if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
if (http_tls_cfg.enabled && ast_ssl_setup(https_desc.tls_cfg)) {
ast_tcptls_server_start(&https_desc);
}
return 0; return 0;
} }