diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2012-05-21 11:26:40 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-05-22 23:16:44 +0300 |
| commit | ba354a8cc091039662e50f1a5a194f5b589056f6 (patch) | |
| tree | 21f9e65aac7723648cb24d12300235809528ee21 | |
| parent | 4a9ca9355607053fdbcb8adcb614b08305eca88f (diff) | |
| download | ffmpeg-ba354a8cc091039662e50f1a5a194f5b589056f6.tar.gz | |
http: Add http_shutdown() for ending writing of posts
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavformat/http.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index ea7c693b34..124f533a1f 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -51,6 +51,7 @@ typedef struct { char *headers; int willclose; /**< Set if the server correctly handles Connection: close and will close the connection after feeding us the content. */ int chunked_post; + int end_chunked_post; /**< A flag which indicates if the end of chunked encoding has been sent. */ } HTTPContext; #define OFFSET(x) offsetof(HTTPContext, x) @@ -415,6 +416,7 @@ static int http_connect(URLContext *h, const char *path, const char *local_path, s->off = 0; s->filesize = -1; s->willclose = 0; + s->end_chunked_post = 0; if (post) { /* Pretend that it did work. We didn't read any header yet, since * we've still to send the POST data, but the code calling this @@ -512,16 +514,30 @@ static int http_write(URLContext *h, const uint8_t *buf, int size) return size; } -static int http_close(URLContext *h) +static int http_shutdown(URLContext *h, int flags) { int ret = 0; char footer[] = "0\r\n\r\n"; HTTPContext *s = h->priv_data; /* signal end of chunked encoding if used */ - if ((h->flags & AVIO_FLAG_WRITE) && s->chunked_post) { + if ((flags & AVIO_FLAG_WRITE) && s->chunked_post) { ret = ffurl_write(s->hd, footer, sizeof(footer) - 1); ret = ret > 0 ? 0 : ret; + s->end_chunked_post = 1; + } + + return ret; +} + +static int http_close(URLContext *h) +{ + int ret = 0; + HTTPContext *s = h->priv_data; + + if (!s->end_chunked_post) { + /* Close the write direction by sending the end of chunked encoding. */ + ret = http_shutdown(h, h->flags); } if (s->hd) @@ -581,6 +597,7 @@ URLProtocol ff_http_protocol = { .url_seek = http_seek, .url_close = http_close, .url_get_file_handle = http_get_file_handle, + .url_shutdown = http_shutdown, .priv_data_size = sizeof(HTTPContext), .priv_data_class = &http_context_class, .flags = URL_PROTOCOL_FLAG_NETWORK, |