diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-02-08 20:39:41 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-02-08 20:39:41 +0000 |
| commit | cd1973e4bcba42bf1b106cb1bd0af535a0e13e3f (patch) | |
| tree | 9cecb121e660844ab60fd8cc89ffc7a83973eab4 /main | |
| parent | bcb5daf74dc6fbb66ee2e2b1f8821bc54303cf32 (diff) | |
It is with pleasure that I announce the return of rawman support through the HTTP server. (issue #9013 reported by Jynger)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53635 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/manager.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/main/manager.c b/main/manager.c index a96818e8a..decc65e13 100644 --- a/main/manager.c +++ b/main/manager.c @@ -2809,16 +2809,17 @@ static struct ast_str *generic_http_callback(enum output_format format, if (s->f != NULL) { /* have temporary output */ char *buf; size_t l = ftell(s->f); - - if (format == FORMAT_XML || format == FORMAT_HTML) { - if (l) { - if ((buf = mmap(NULL, l, PROT_READ | PROT_WRITE, MAP_SHARED, s->fd, 0))) { + + if (l) { + if ((buf = mmap(NULL, l, PROT_READ | PROT_WRITE, MAP_SHARED, s->fd, 0))) { + if (format == FORMAT_XML || format == FORMAT_HTML) xml_translate(&out, buf, params, format); - munmap(buf, l); - } - } else { - xml_translate(&out, "", params, format); + else + ast_str_append(&out, 0, buf); + munmap(buf, l); } + } else if (format == FORMAT_XML || format == FORMAT_HTML) { + xml_translate(&out, "", params, format); } fclose(s->f); s->f = NULL; |