diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-06 00:11:09 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-06 00:11:09 +0000 |
| commit | c30ba146debc6b92b6875a7dc1ff951f4a6c6b70 (patch) | |
| tree | 11f7ecd8b9f5e34026e49161c85f2861401f79a5 /main/http.c | |
| parent | cc4b6c80303144f1793c53728265669e35e9868a (diff) | |
Merged revisions 105773 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r105773 | russell | 2008-03-04 16:15:18 -0600 (Tue, 04 Mar 2008) | 2 lines
Rename public object server_instance to ast_tcptls_server_instance
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@106303 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 c1ec9f759..487200256 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 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_server_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 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_server_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 server_instance *ser, char *uri, +static struct ast_str *handle_post(struct ast_tcptls_server_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 server_instance *ser, char *uri, return ast_http_error(200, "OK", NULL, "File successfully uploaded."); } -static struct ast_str *handle_uri(struct server_instance *ser, char *uri, int *status, +static struct ast_str *handle_uri(struct ast_tcptls_server_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 server_instance *ser = data; + struct ast_tcptls_server_instance *ser = data; struct ast_variable *var, *prev=NULL, *vars=NULL, *headers = NULL; char *uri, *title=NULL; int status = 200, contentlength = 0; |