aboutsummaryrefslogtreecommitdiffstats
path: root/main/http.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-04 22:23:21 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-04 22:23:21 +0000
commitc2841b668a2e165bd5fedb79138379efd904c009 (patch)
tree2a0156cf546653e08e9faeaef7deab0b3cc57084 /main/http.c
parent8ef91aad9ee6e3cf949c96a34ae195c69b20ed67 (diff)
More public API name changes to use an appropriate ast_ prefix
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@105785 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/http.c')
-rw-r--r--main/http.c10
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;
}