diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-03-10 16:09:09 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-03-10 16:09:09 +0000 |
| commit | 3faeef27fe4f397c6a51c90e5c313fa87e955525 (patch) | |
| tree | 7753c8a35eaa2865b6a433e5b4fa69b93082df56 /res | |
| parent | 4af362b078073f3d983371f9adc638352bf096eb (diff) | |
Merged revisions 310240 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r310240 | twilson | 2011-03-10 10:05:45 -0600 (Thu, 10 Mar 2011) | 13 lines
Add \r\n to remaining http headers passed to ast_http_send
r309204 changed the behavior of ast_http_send. It now requires headers
to be passed with trailing \r\n. This change updates the remaining
instances in the code that did not pass the \r\n.
(closes issue #18186)
Reported by: nivaldomjunior
Patches:
res_phoneprov.c.diff uploaded by lathama (license 1028)
manager.diff.txt uploaded by twilson (license 396)
Tested by: lathama
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@310241 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_phoneprov.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c index e969bc402..24d7b6505 100644 --- a/res/res_phoneprov.c +++ b/res/res_phoneprov.c @@ -440,7 +440,7 @@ static int phoneprov_callback(struct ast_tcptls_session_instance *ser, const str } http_header = ast_str_create(80); - ast_str_set(&http_header, 0, "Content-type: %s", + ast_str_set(&http_header, 0, "Content-type: %s\r\n", route->file->mime_type); ast_http_send(ser, method, 200, NULL, http_header, NULL, fd, 0); @@ -504,7 +504,7 @@ static int phoneprov_callback(struct ast_tcptls_session_instance *ser, const str } http_header = ast_str_create(80); - ast_str_set(&http_header, 0, "Content-type: %s", + ast_str_set(&http_header, 0, "Content-type: %s\r\n", route->file->mime_type); if (!(result = ast_str_create(512))) { |