The subject line feels a bit misworded (I don't understand how the latter
half relates - this doesn't change behaviour anywhere). What about
http: Add http_shutdown() for ending writing of posts
(Or something similar.)
On Sun, 20 May 2012, Samuel Pitoiset wrote:
This function is only called when the end of chunked encoding is used.
---
libavformat/http.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/libavformat/http.c b/libavformat/http.c
index ea7c693..419688f 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;
+ char end_chunked_post; /**< A flag which indicates if the end of chunked
encoding has been send. */
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,
--
1.7.10.2
Other than that, looks good to me.
// Martin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
