diff options
author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-12-13 08:36:35 +0000 |
---|---|---|
committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-12-13 08:36:35 +0000 |
commit | c8223fc9578754dfaef1b337e5f0dfff546461b4 (patch) | |
tree | 0559c99680217b78c0bda37a131b5f09794f43c6 /main/http.c | |
parent | 3b96ae826e7e280bff1d16ddc50d9328c7ea70ac (diff) |
Merge ast_str_opaque branch (discontinue usage of ast_str internals)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@163991 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/http.c')
-rw-r--r-- | main/http.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/http.c b/main/http.c index 5c3aa7895..237ad6643 100644 --- a/main/http.c +++ b/main/http.c @@ -755,14 +755,14 @@ static void *httpd_helper_thread(void *data) * append a random variable to your GET request. Ex: 'something.html?r=109987734' */ if (!contentlength) { /* opaque body ? just dump it hoping it is properly formatted */ - fprintf(ser->f, "%s", out->str); + fprintf(ser->f, "%s", ast_str_buffer(out)); } else { - char *tmp = strstr(out->str, "\r\n\r\n"); + char *tmp = strstr(ast_str_buffer(out), "\r\n\r\n"); if (tmp) { fprintf(ser->f, "Content-length: %d\r\n", contentlength); /* first write the header, then the body */ - if (fwrite(out->str, 1, (tmp + 4 - out->str), ser->f) != tmp + 4 - out->str) { + if (fwrite(ast_str_buffer(out), 1, (tmp + 4 - ast_str_buffer(out)), ser->f) != tmp + 4 - ast_str_buffer(out)) { ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno)); } if (fwrite(tmp + 4, 1, contentlength, ser->f) != contentlength ) { |