diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-12 22:50:14 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-12 22:50:14 +0000 |
| commit | f3a81a8122a05e058bbd0581b5dc7bb44178974a (patch) | |
| tree | d4e28d906289bab018d72dedf3be2412ff650639 /main/http.c | |
| parent | fb165a268e4a5b779280868589beab30aaacb0f5 (diff) | |
Merged revisions 108295 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r108295 | russell | 2008-03-12 17:13:18 -0500 (Wed, 12 Mar 2008) | 3 lines
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/branches/1.6.0@108348 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/http.c')
| -rw-r--r-- | main/http.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/main/http.c b/main/http.c index 93ad398e1..462e3ff34 100644 --- a/main/http.c +++ b/main/http.c @@ -136,7 +136,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; @@ -206,7 +206,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; @@ -391,7 +391,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) { @@ -534,7 +534,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) { @@ -682,7 +682,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; @@ -826,7 +826,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; } |