aboutsummaryrefslogtreecommitdiffstats
path: root/main/http.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-12 22:13:18 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-12 22:13:18 +0000
commitf5ce5710ecc572cdf3ab8da5f71df2972c654ade (patch)
tree8a8884d949ffae4bada2cff15af9b00b1cecb68e /main/http.c
parent4b632d81e540db7eb1404bd9716f5c3ee31d166a (diff)
Rename ast_tcptls_server_instance to session_instance, since this pertains to
server and client usage. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@108295 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/http.c')
-rw-r--r--main/http.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/main/http.c b/main/http.c
index 7588461e2..f48ee6138 100644
--- a/main/http.c
+++ b/main/http.c
@@ -137,7 +137,7 @@ static const char *ftype2mtype(const char *ftype, char *wkspace, int wkspacelen)
return wkspace;
}
-static struct ast_str *static_callback(struct ast_tcptls_server_instance *ser, const char *uri, struct ast_variable *vars, int *status, char **title, int *contentlength)
+static struct ast_str *static_callback(struct ast_tcptls_session_instance *ser, const char *uri, struct ast_variable *vars, int *status, char **title, int *contentlength)
{
char *path;
char *ftype;
@@ -207,7 +207,7 @@ out403:
}
-static struct ast_str *httpstatus_callback(struct ast_tcptls_server_instance *ser, const char *uri, struct ast_variable *vars, int *status, char **title, int *contentlength)
+static struct ast_str *httpstatus_callback(struct ast_tcptls_session_instance *ser, const char *uri, struct ast_variable *vars, int *status, char **title, int *contentlength)
{
struct ast_str *out = ast_str_create(512);
struct ast_variable *v;
@@ -392,7 +392,7 @@ static void post_raw(struct mm_mimepart *part, const char *post_dir, const char
fclose(f);
}
-static struct ast_str *handle_post(struct ast_tcptls_server_instance *ser, char *uri,
+static struct ast_str *handle_post(struct ast_tcptls_session_instance *ser, char *uri,
int *status, char **title, int *contentlength, struct ast_variable *headers,
struct ast_variable *cookies)
{
@@ -535,7 +535,7 @@ static struct ast_str *handle_post(struct ast_tcptls_server_instance *ser, char
return ast_http_error(200, "OK", NULL, "File successfully uploaded.");
}
-static struct ast_str *handle_uri(struct ast_tcptls_server_instance *ser, char *uri, int *status,
+static struct ast_str *handle_uri(struct ast_tcptls_session_instance *ser, char *uri, int *status,
char **title, int *contentlength, struct ast_variable **cookies,
unsigned int *static_content)
{
@@ -683,7 +683,7 @@ static void *httpd_helper_thread(void *data)
{
char buf[4096];
char cookie[4096];
- struct ast_tcptls_server_instance *ser = data;
+ struct ast_tcptls_session_instance *ser = data;
struct ast_variable *var, *prev=NULL, *vars=NULL, *headers = NULL;
char *uri, *title=NULL;
int status = 200, contentlength = 0;
@@ -827,7 +827,7 @@ static void *httpd_helper_thread(void *data)
done:
fclose(ser->f);
- ser = ast_tcptls_server_instance_destroy(ser);
+ ser = ast_tcptls_session_instance_destroy(ser);
return NULL;
}