diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-06 00:13:10 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-06 00:13:10 +0000 |
commit | 35c7172e36a9451010836ed9cc7dd0db37609098 (patch) | |
tree | 11a76742d1b1294ff1adc9cb73b4f00c13082a8a /main/http.c | |
parent | c30ba146debc6b92b6875a7dc1ff951f4a6c6b70 (diff) |
Merged revisions 105785 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r105785 | russell | 2008-03-04 16:23:21 -0600 (Tue, 04 Mar 2008) | 2 lines
More public API name changes to use an appropriate ast_ prefix
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@106304 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/http.c')
-rw-r--r-- | main/http.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/http.c b/main/http.c index 487200256..11db1779c 100644 --- a/main/http.c +++ b/main/http.c @@ -73,7 +73,7 @@ static struct server_args http_desc = { .tls_cfg = NULL, .poll_timeout = -1, .name = "http server", - .accept_fn = server_root, + .accept_fn = ast_tcptls_server_root, .worker_fn = httpd_helper_thread, }; @@ -83,7 +83,7 @@ static struct server_args https_desc = { .tls_cfg = &http_tls_cfg, .poll_timeout = -1, .name = "https server", - .accept_fn = server_root, + .accept_fn = ast_tcptls_server_root, .worker_fn = httpd_helper_thread, }; @@ -1028,9 +1028,9 @@ static int __ast_http_load(int reload) if (strcmp(prefix, newprefix)) ast_copy_string(prefix, newprefix, sizeof(prefix)); enablestatic = newenablestatic; - server_start(&http_desc); - if (ssl_setup(https_desc.tls_cfg)) - server_start(&https_desc); + ast_tcptls_server_start(&http_desc); + if (ast_ssl_setup(https_desc.tls_cfg)) + ast_tcptls_server_start(&https_desc); return 0; } |