RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

http: Add http_shutdown() for ending writing of posts 

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Samuel Pitoiset 2012-05-21 11:26:40 +02:00 committed by Martin Storsjö
parent 4a9ca93556
commit ba354a8cc0
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavformat/http.c
View File

@ -51,6 +51,7 @@ typedef struct {
char *headers; char *headers;
int willclose; /**< Set if the server correctly handles Connection: close and will close the connection after feeding us the content. */ int willclose; /**< Set if the server correctly handles Connection: close and will close the connection after feeding us the content. */
int chunked_post; int chunked_post;
int end_chunked_post; /**< A flag which indicates if the end of chunked encoding has been sent. */
} HTTPContext; } HTTPContext;
#define OFFSET(x) offsetof(HTTPContext, x) #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->off = 0;
s->filesize = -1; s->filesize = -1;
s->willclose = 0; s->willclose = 0;
s->end_chunked_post = 0;
if (post) { if (post) {
/* Pretend that it did work. We didn't read any header yet, since /* 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 * 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; return size;
} }
static int http_close(URLContext *h) static int http_shutdown(URLContext *h, int flags)
{ {
int ret = 0; int ret = 0;
char footer[] = "0\r\n\r\n"; char footer[] = "0\r\n\r\n";
HTTPContext *s = h->priv_data; HTTPContext *s = h->priv_data;
/* signal end of chunked encoding if used */ /* 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 = ffurl_write(s->hd, footer, sizeof(footer) - 1);
ret = ret > 0 ? 0 : ret; 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) if (s->hd)
@ -581,6 +597,7 @@ URLProtocol ff_http_protocol = {
.url_seek = http_seek, .url_seek = http_seek,
.url_close = http_close, .url_close = http_close,
.url_get_file_handle = http_get_file_handle, .url_get_file_handle = http_get_file_handle,
.url_shutdown = http_shutdown,
.priv_data_size = sizeof(HTTPContext), .priv_data_size = sizeof(HTTPContext),
.priv_data_class = &http_context_class, .priv_data_class = &http_context_class,
.flags = URL_PROTOCOL_FLAG_NETWORK, .flags = URL_PROTOCOL_FLAG_NETWORK,