dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Fix mime parsing by re-adding support for passing headers to callback functions 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@135235 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
twilson 2008-08-01 21:56:07 +00:00
parent 2204bee5d5
commit ce46696768
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
main/http.c
View File

@ -657,6 +657,7 @@ static void *httpd_helper_thread(void *data)
int status = 200, contentlength = 0;
struct ast_str *out = NULL;
unsigned int static_content = 0;
struct ast_variable *tail = headers;
if (!fgets(buf, sizeof(buf), ser->f)) {
goto done;
@ -686,6 +687,24 @@ static void *httpd_helper_thread(void *data)
}
if (!strncasecmp(cookie, "Cookie: ", 8)) {
vars = parse_cookies(cookie);
} else {
char *name, *val;
val = cookie;
name = strsep(&val, ":");
if (ast_strlen_zero(name) || ast_strlen_zero(val)) {
continue;
}
ast_trim_blanks(name);
val = ast_skip_blanks(val);
if (!headers) {
headers = ast_variable_new(name, val, __FILE__);
tail = headers;
} else {
tail->next = ast_variable_new(name, val, __FILE__);
tail = tail->next;
}
}
}

6
res/res_http_post.c
View File

@ -203,6 +203,8 @@ static struct ast_str *http_post_callback(struct ast_tcptls_session_instance *se
}
for (var = headers; var; var = var->next) {
fprintf(f, "%s: %s\r\n", var->name, var->value);
if (!strcasecmp(var->name, "Content-Length")) {
if ((sscanf(var->value, "%u", &content_len)) != 1) {
ast_log(LOG_ERROR, "Invalid Content-Length in POST request!\n");
@ -211,11 +213,11 @@ static struct ast_str *http_post_callback(struct ast_tcptls_session_instance *se
return NULL;
}
ast_debug(1, "Got a Content-Length of %d\n", content_len);
} else if (!strcasecmp(var->name, "Content-Type")) {
fprintf(f, "Content-Type: %s\r\n\r\n", var->value);
}
}
fprintf(f, "\r\n");
for (res = sizeof(buf); content_len; content_len -= res) {
if (content_len < res) {
res = content_len;