* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
+#if CONFIG_ZLIB
+#include <zlib.h>
+#endif /* CONFIG_ZLIB */
+
#include "libavutil/avstring.h"
+#include "libavutil/opt.h"
+
#include "avformat.h"
+#include "http.h"
+#include "httpauth.h"
#include "internal.h"
#include "network.h"
-#include "http.h"
#include "os_support.h"
-#include "httpauth.h"
#include "url.h"
-#include "libavutil/opt.h"
-
-#if CONFIG_ZLIB
-#include <zlib.h>
-#endif
/* XXX: POST protocol is not completely implemented because avconv uses
- only a subset of it. */
+ * only a subset of it. */
/* The IO buffer size is unrelated to the max URL size in itself, but needs
* to be large enough to fit the full request headers (including long
- * path names).
- */
-#define BUFFER_SIZE MAX_URL_SIZE
+ * path names). */
+#define BUFFER_SIZE MAX_URL_SIZE
#define MAX_REDIRECTS 8
typedef struct {
int http_code;
/* Used if "Transfer-Encoding: chunked" otherwise -1. */
int64_t chunksize;
- int64_t off, filesize;
+ int64_t off, end_off, filesize;
char *location;
HTTPAuthState auth_state;
HTTPAuthState proxy_auth_state;
char *headers;
char *mime_type;
char *user_agent;
+ char *content_type;
/* Set if the server correctly handles Connection: close and will close
* the connection after feeding us the content. */
int willclose;
int icy_metaint;
char *icy_metadata_headers;
char *icy_metadata_packet;
+ AVDictionary *metadata;
#if CONFIG_ZLIB
int compressed;
z_stream inflate_stream;
uint8_t *inflate_buffer;
-#endif
+#endif /* CONFIG_ZLIB */
AVDictionary *chained_options;
int send_expect_100;
+ char *method;
} HTTPContext;
#define OFFSET(x) offsetof(HTTPContext, x)
#define D AV_OPT_FLAG_DECODING_PARAM
#define E AV_OPT_FLAG_ENCODING_PARAM
#define DEFAULT_USER_AGENT "Lavf/" AV_STRINGIFY(LIBAVFORMAT_VERSION)
+
static const AVOption options[] = {
-{"chunked_post", "use chunked transfer-encoding for posts", OFFSET(chunked_post), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, E },
-{"headers", "custom HTTP headers, can override built in default headers", OFFSET(headers), AV_OPT_TYPE_STRING, { 0 }, 0, 0, D|E },
-{"user_agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = DEFAULT_USER_AGENT}, 0, 0, D },
-{"user-agent", "override User-Agent header, for compatibility with ffmpeg", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = DEFAULT_USER_AGENT}, 0, 0, D },
-{"multiple_requests", "use persistent connections", OFFSET(multiple_requests), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D|E },
-{"post_data", "custom HTTP post data", OFFSET(post_data), AV_OPT_TYPE_BINARY, .flags = D|E },
-{"mime_type", "export the MIME type", OFFSET(mime_type), AV_OPT_TYPE_STRING, {0}, 0, 0, AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY },
-{"icy", "request ICY metadata", OFFSET(icy), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D },
-{"icy_metadata_headers", "return ICY metadata headers", OFFSET(icy_metadata_headers), AV_OPT_TYPE_STRING, {0}, 0, 0, AV_OPT_FLAG_EXPORT },
-{"icy_metadata_packet", "return current ICY metadata packet", OFFSET(icy_metadata_packet), AV_OPT_TYPE_STRING, {0}, 0, 0, AV_OPT_FLAG_EXPORT },
-{"auth_type", "HTTP authentication type", OFFSET(auth_state.auth_type), AV_OPT_TYPE_INT, {.i64 = HTTP_AUTH_NONE}, HTTP_AUTH_NONE, HTTP_AUTH_BASIC, D|E, "auth_type" },
-{"none", "No auth method set, autodetect", 0, AV_OPT_TYPE_CONST, {.i64 = HTTP_AUTH_NONE}, 0, 0, D|E, "auth_type" },
-{"basic", "HTTP basic authentication", 0, AV_OPT_TYPE_CONST, {.i64 = HTTP_AUTH_BASIC}, 0, 0, D|E, "auth_type" },
-{"send_expect_100", "Force sending an Expect: 100-continue header for POST", OFFSET(send_expect_100), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, E },
-{"location", "The actual location of the data received", OFFSET(location), AV_OPT_TYPE_STRING, { 0 }, 0, 0, D|E },
-{NULL}
+ { "chunked_post", "use chunked transfer-encoding for posts", OFFSET(chunked_post), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, E },
+ { "headers", "set custom HTTP headers, can override built in default headers", OFFSET(headers), AV_OPT_TYPE_STRING, { 0 }, 0, 0, D | E },
+ { "content_type", "set a specific content type for the POST messages", OFFSET(content_type), AV_OPT_TYPE_STRING, { 0 }, 0, 0, D | E },
+ { "user_agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, { .str = DEFAULT_USER_AGENT }, 0, 0, D },
+ { "user-agent", "override User-Agent header, for compatibility with ffmpeg", OFFSET(user_agent), AV_OPT_TYPE_STRING, { .str = DEFAULT_USER_AGENT }, 0, 0, D },
+ { "multiple_requests", "use persistent connections", OFFSET(multiple_requests), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, D | E },
+ { "post_data", "set custom HTTP post data", OFFSET(post_data), AV_OPT_TYPE_BINARY, .flags = D | E },
+ { "mime_type", "export the MIME type", OFFSET(mime_type), AV_OPT_TYPE_STRING, { 0 }, 0, 0, AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY },
+ { "icy", "request ICY metadata", OFFSET(icy), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, D },
+ { "icy_metadata_headers", "return ICY metadata headers", OFFSET(icy_metadata_headers), AV_OPT_TYPE_STRING, { 0 }, 0, 0, AV_OPT_FLAG_EXPORT },
+ { "icy_metadata_packet", "return current ICY metadata packet", OFFSET(icy_metadata_packet), AV_OPT_TYPE_STRING, { 0 }, 0, 0, AV_OPT_FLAG_EXPORT },
+ { "metadata", "metadata read from the bitstream", OFFSET(metadata), AV_OPT_TYPE_DICT, {0}, 0, 0, AV_OPT_FLAG_EXPORT },
+ { "auth_type", "HTTP authentication type", OFFSET(auth_state.auth_type), AV_OPT_TYPE_INT, { .i64 = HTTP_AUTH_NONE }, HTTP_AUTH_NONE, HTTP_AUTH_BASIC, D | E, "auth_type"},
+ { "none", "No auth method set, autodetect", 0, AV_OPT_TYPE_CONST, { .i64 = HTTP_AUTH_NONE }, 0, 0, D | E, "auth_type"},
+ { "basic", "HTTP basic authentication", 0, AV_OPT_TYPE_CONST, { .i64 = HTTP_AUTH_BASIC }, 0, 0, D | E, "auth_type"},
+ { "send_expect_100", "Force sending an Expect: 100-continue header for POST", OFFSET(send_expect_100), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, E },
+ { "location", "The actual location of the data received", OFFSET(location), AV_OPT_TYPE_STRING, { 0 }, 0, 0, D | E },
+ { "offset", "initial byte offset", OFFSET(off), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, INT64_MAX, D },
+ { "end_offset", "try to limit the request to bytes preceding this offset", OFFSET(end_off), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, INT64_MAX, D },
+ { "method", "Override the HTTP method", OFFSET(method), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E },
+ { NULL }
};
-#define HTTP_CLASS(flavor)\
-static const AVClass flavor ## _context_class = {\
- .class_name = #flavor,\
- .item_name = av_default_item_name,\
- .option = options,\
- .version = LIBAVUTIL_VERSION_INT,\
-}
-
-HTTP_CLASS(http);
-HTTP_CLASS(https);
static int http_connect(URLContext *h, const char *path, const char *local_path,
const char *hoststr, const char *auth,
void ff_http_init_auth_state(URLContext *dest, const URLContext *src)
{
- memcpy(&((HTTPContext*)dest->priv_data)->auth_state,
- &((HTTPContext*)src->priv_data)->auth_state, sizeof(HTTPAuthState));
- memcpy(&((HTTPContext*)dest->priv_data)->proxy_auth_state,
- &((HTTPContext*)src->priv_data)->proxy_auth_state,
+ memcpy(&((HTTPContext *)dest->priv_data)->auth_state,
+ &((HTTPContext *)src->priv_data)->auth_state,
+ sizeof(HTTPAuthState));
+ memcpy(&((HTTPContext *)dest->priv_data)->proxy_auth_state,
+ &((HTTPContext *)src->priv_data)->proxy_auth_state,
sizeof(HTTPAuthState));
}
-/* return non zero if error */
-static int http_open_cnx(URLContext *h, AVDictionary **options)
+static int http_open_cnx_internal(URLContext *h, AVDictionary **options)
{
const char *path, *proxy_path, *lower_proto = "tcp", *local_path;
char hostname[1024], hoststr[1024], proto[10];
char auth[1024], proxyauth[1024] = "";
char path1[MAX_URL_SIZE];
char buf[1024], urlbuf[MAX_URL_SIZE];
- int port, use_proxy, err, location_changed = 0, redirects = 0, attempts = 0;
- HTTPAuthType cur_auth_type, cur_proxy_auth_type;
+ int port, use_proxy, err, location_changed = 0;
HTTPContext *s = h->priv_data;
- /* fill the dest addr */
- redo:
- /* needed in any case to build the host string */
av_url_split(proto, sizeof(proto), auth, sizeof(auth),
hostname, sizeof(hostname), &port,
path1, sizeof(path1), s->location);
ff_url_join(hoststr, sizeof(hoststr), NULL, NULL, hostname, port, NULL);
proxy_path = getenv("http_proxy");
- use_proxy = !ff_http_match_no_proxy(getenv("no_proxy"), hostname) &&
- proxy_path != NULL && av_strstart(proxy_path, "http://", NULL);
+ use_proxy = !ff_http_match_no_proxy(getenv("no_proxy"), hostname) &&
+ proxy_path && av_strstart(proxy_path, "http://", NULL);
if (!strcmp(proto, "https")) {
lower_proto = "tls";
- use_proxy = 0;
+ use_proxy = 0;
if (port < 0)
port = 443;
}
err = ffurl_open(&s->hd, buf, AVIO_FLAG_READ_WRITE,
&h->interrupt_callback, options);
if (err < 0)
- goto fail;
+ return err;
}
- cur_auth_type = s->auth_state.auth_type;
+ err = http_connect(h, path, local_path, hoststr,
+ auth, proxyauth, &location_changed);
+ if (err < 0)
+ return err;
+
+ return location_changed;
+}
+
+/* return non zero if error */
+static int http_open_cnx(URLContext *h, AVDictionary **options)
+{
+ HTTPAuthType cur_auth_type, cur_proxy_auth_type;
+ HTTPContext *s = h->priv_data;
+ int location_changed, attempts = 0, redirects = 0;
+redo:
+ cur_auth_type = s->auth_state.auth_type;
cur_proxy_auth_type = s->auth_state.auth_type;
- if (http_connect(h, path, local_path, hoststr, auth, proxyauth, &location_changed) < 0)
+
+ location_changed = http_open_cnx_internal(h, options);
+ if (location_changed < 0)
goto fail;
+
attempts++;
if (s->http_code == 401) {
if ((cur_auth_type == HTTP_AUTH_NONE || s->auth_state.stale) &&
} else
goto fail;
}
- if ((s->http_code == 301 || s->http_code == 302 || s->http_code == 303 || s->http_code == 307)
- && location_changed == 1) {
+ if ((s->http_code == 301 || s->http_code == 302 ||
+ s->http_code == 303 || s->http_code == 307) &&
+ location_changed == 1) {
/* url moved, get next */
ffurl_close(s->hd);
s->hd = NULL;
/* Restart the authentication process with the new target, which
* might use a different auth mechanism. */
memset(&s->auth_state, 0, sizeof(s->auth_state));
- attempts = 0;
+ attempts = 0;
location_changed = 0;
goto redo;
}
return 0;
- fail:
+
+fail:
if (s->hd)
ffurl_close(s->hd);
s->hd = NULL;
AVDictionary *options = NULL;
int ret;
- s->off = 0;
+ s->off = 0;
s->icy_data_read = 0;
av_free(s->location);
s->location = av_strdup(uri);
if (s->headers) {
int len = strlen(s->headers);
if (len < 2 || strcmp("\r\n", s->headers + len - 2))
- av_log(h, AV_LOG_WARNING, "No trailing CRLF found in HTTP header.\n");
+ av_log(h, AV_LOG_WARNING,
+ "No trailing CRLF found in HTTP header.\n");
}
ret = http_open_cnx(h, options);
av_dict_free(&s->chained_options);
return ret;
}
+
static int http_getc(HTTPContext *s)
{
int len;
char *q;
q = line;
- for(;;) {
+ for (;;) {
ch = http_getc(s);
if (ch < 0)
return ch;
}
/* "bytes $from-$to/$document_size" */
-static void parse_content_range(URLContext *h, char *p)
+static void parse_content_range(URLContext *h, const char *p)
{
HTTPContext *s = h->priv_data;
const char *slash;
if (!strncmp(p, "bytes ", 6)) {
- p += 6;
+ p += 6;
s->off = strtoll(p, NULL, 10);
if ((slash = strchr(p, '/')) && strlen(slash) > 0)
- s->filesize = strtoll(slash+1, NULL, 10);
+ s->filesize = strtoll(slash + 1, NULL, 10);
}
h->is_streamed = 0; /* we _can_ in fact seek */
}
-static int parse_content_encoding(URLContext *h, char *p)
+static int parse_content_encoding(URLContext *h, const char *p)
{
- HTTPContext *s = h->priv_data;
-
if (!av_strncasecmp(p, "gzip", 4) ||
!av_strncasecmp(p, "deflate", 7)) {
#if CONFIG_ZLIB
+ HTTPContext *s = h->priv_data;
+
s->compressed = 1;
inflateEnd(&s->inflate_stream);
if (inflateInit2(&s->inflate_stream, 32 + 15) != Z_OK) {
av_log(h, AV_LOG_WARNING,
"Compressed (%s) content, need zlib with gzip support\n", p);
return AVERROR(ENOSYS);
-#endif
+#endif /* CONFIG_ZLIB */
} else if (!av_strncasecmp(p, "identity", 8)) {
// The normal, no-encoding case (although servers shouldn't include
// the header at all if this is the case).
static int parse_icy(HTTPContext *s, const char *tag, const char *p)
{
int len = 4 + strlen(p) + strlen(tag);
+ int is_first = !s->icy_metadata_headers;
int ret;
+ av_dict_set(&s->metadata, tag, p, 0);
+
if (s->icy_metadata_headers)
len += strlen(s->icy_metadata_headers);
if ((ret = av_reallocp(&s->icy_metadata_headers, len)) < 0)
return ret;
+ if (is_first)
+ *s->icy_metadata_headers = '\0';
+
av_strlcatf(s->icy_metadata_headers, len, "%s: %s\n", tag, p);
return 0;
if (*p != ':')
return 1;
- *p = '\0';
+ *p = '\0';
tag = line;
p++;
while (av_isspace(*p))
h->is_streamed = 0;
} else if (!av_strcasecmp(tag, "Transfer-Encoding") &&
!av_strncasecmp(p, "chunked", 7)) {
- s->filesize = -1;
+ s->filesize = -1;
s->chunksize = 0;
} else if (!av_strcasecmp(tag, "WWW-Authenticate")) {
ff_http_auth_handle_header(&s->auth_state, tag, p);
} else if (!av_strcasecmp(tag, "Connection")) {
if (!strcmp(p, "close"))
s->willclose = 1;
- } else if (!av_strcasecmp (tag, "Content-Type")) {
+ } else if (!av_strcasecmp(tag, "Content-Type")) {
av_free(s->mime_type);
s->mime_type = av_strdup(p);
- } else if (!av_strcasecmp (tag, "Icy-MetaInt")) {
+ } else if (!av_strcasecmp(tag, "Icy-MetaInt")) {
s->icy_metaint = strtoll(p, NULL, 10);
} else if (!av_strncasecmp(tag, "Icy-", 4)) {
if ((ret = parse_icy(s, tag, p)) < 0)
{
HTTPContext *s = h->priv_data;
int post, err;
- char headers[1024] = "";
+ char headers[HTTP_HEADERS_SIZE] = "";
char *authstr = NULL, *proxyauthstr = NULL;
int64_t off = s->off;
int len = 0;
const char *method;
int send_expect_100 = 0;
-
/* send http header */
post = h->flags & AVIO_FLAG_WRITE;
if (s->post_data) {
/* force POST method and disable chunked encoding when
* custom HTTP post data is set */
- post = 1;
+ post = 1;
s->chunked_post = 0;
}
- method = post ? "POST" : "GET";
- authstr = ff_http_auth_create_response(&s->auth_state, auth, local_path,
- method);
+ if (s->method)
+ method = s->method;
+ else
+ method = post ? "POST" : "GET";
+
+ authstr = ff_http_auth_create_response(&s->auth_state, auth,
+ local_path, method);
proxyauthstr = ff_http_auth_create_response(&s->proxy_auth_state, proxyauth,
local_path, method);
if (post && !s->post_data) {
if (!has_header(s->headers, "\r\nAccept: "))
len += av_strlcpy(headers + len, "Accept: */*\r\n",
sizeof(headers) - len);
- if (!has_header(s->headers, "\r\nRange: ") && !post)
+ // Note: we send this on purpose even when s->off is 0 when we're probing,
+ // since it allows us to detect more reliably if a (non-conforming)
+ // server supports seeking by analysing the reply headers.
+ if (!has_header(s->headers, "\r\nRange: ") && !post) {
len += av_strlcatf(headers + len, sizeof(headers) - len,
- "Range: bytes=%"PRId64"-\r\n", s->off);
+ "Range: bytes=%"PRId64"-", s->off);
+ if (s->end_off)
+ len += av_strlcatf(headers + len, sizeof(headers) - len,
+ "%"PRId64, s->end_off - 1);
+ len += av_strlcpy(headers + len, "\r\n",
+ sizeof(headers) - len);
+ }
if (send_expect_100 && !has_header(s->headers, "\r\nExpect: "))
len += av_strlcatf(headers + len, sizeof(headers) - len,
"Expect: 100-continue\r\n");
if (!has_header(s->headers, "\r\nConnection: ")) {
- if (s->multiple_requests) {
+ if (s->multiple_requests)
len += av_strlcpy(headers + len, "Connection: keep-alive\r\n",
sizeof(headers) - len);
- } else {
+ else
len += av_strlcpy(headers + len, "Connection: close\r\n",
sizeof(headers) - len);
- }
}
if (!has_header(s->headers, "\r\nHost: "))
if (!has_header(s->headers, "\r\nContent-Length: ") && s->post_data)
len += av_strlcatf(headers + len, sizeof(headers) - len,
"Content-Length: %d\r\n", s->post_datalen);
- if (!has_header(s->headers, "\r\nIcy-MetaData: ") && s->icy) {
+
+ if (!has_header(s->headers, "\r\nContent-Type: ") && s->content_type)
+ len += av_strlcatf(headers + len, sizeof(headers) - len,
+ "Content-Type: %s\r\n", s->content_type);
+ if (!has_header(s->headers, "\r\nIcy-MetaData: ") && s->icy)
len += av_strlcatf(headers + len, sizeof(headers) - len,
"Icy-MetaData: %d\r\n", 1);
- }
/* now add in custom headers */
if (s->headers)
return err;
/* init input buffer */
- s->buf_ptr = s->buffer;
- s->buf_end = s->buffer;
- s->line_count = 0;
- s->off = 0;
- s->icy_data_read = 0;
- s->filesize = -1;
- s->willclose = 0;
+ s->buf_ptr = s->buffer;
+ s->buf_end = s->buffer;
+ s->line_count = 0;
+ s->off = 0;
+ s->icy_data_read = 0;
+ s->filesize = -1;
+ s->willclose = 0;
s->end_chunked_post = 0;
- s->end_header = 0;
+ s->end_header = 0;
if (post && !s->post_data && !send_expect_100) {
/* 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
return (off == s->off) ? 0 : -1;
}
-
static int http_buf_read(URLContext *h, uint8_t *buf, int size)
{
HTTPContext *s = h->priv_data;
memcpy(buf, s->buf_ptr, len);
s->buf_ptr += len;
} else {
- if (!s->willclose && s->filesize >= 0 && s->off >= s->filesize)
+ if ((!s->willclose || s->chunksize < 0) &&
+ s->filesize >= 0 && s->off >= s->filesize)
return AVERROR_EOF;
len = ffurl_read(s->hd, buf, size);
}
ret = inflate(&s->inflate_stream, Z_SYNC_FLUSH);
if (ret != Z_OK && ret != Z_STREAM_END)
- av_log(h, AV_LOG_WARNING, "inflate return value: %d, %s\n", ret, s->inflate_stream.msg);
+ av_log(h, AV_LOG_WARNING, "inflate return value: %d, %s\n",
+ ret, s->inflate_stream.msg);
return size - s->inflate_stream.avail_out;
}
-#endif
+#endif /* CONFIG_ZLIB */
static int http_read_stream(URLContext *h, uint8_t *buf, int size)
{
if (!s->chunksize) {
char line[32];
- for(;;) {
+ for (;;) {
do {
if ((err = http_get_line(s, line, sizeof(line))) < 0)
return err;
s->chunksize = strtoll(line, NULL, 16);
- av_dlog(NULL, "Chunked encoding data size: %"PRId64"'\n", s->chunksize);
+ av_dlog(NULL, "Chunked encoding data size: %"PRId64"'\n",
+ s->chunksize);
if (!s->chunksize)
return 0;
#if CONFIG_ZLIB
if (s->compressed)
return http_buf_read_compressed(h, buf, size);
-#endif
+#endif /* CONFIG_ZLIB */
return http_buf_read(h, buf, size);
}
return pos;
}
+static void update_metadata(HTTPContext *s, char *data)
+{
+ char *key;
+ char *val;
+ char *end;
+ char *next = data;
+
+ while (*next) {
+ key = next;
+ val = strstr(key, "='");
+ if (!val)
+ break;
+ end = strstr(val, "';");
+ if (!end)
+ break;
+
+ *val = '\0';
+ *end = '\0';
+ val += 2;
+
+ av_dict_set(&s->metadata, key, val, 0);
+
+ next = end + 2;
+ }
+}
+
static int store_icy(URLContext *h, int size)
{
HTTPContext *s = h->priv_data;
return AVERROR_INVALIDDATA;
if (!remaining) {
- // The metadata packet is variable sized. It has a 1 byte header
- // which sets the length of the packet (divided by 16). If it's 0,
- // the metadata doesn't change. After the packet, icy_metaint bytes
- // of normal data follow.
+ /* The metadata packet is variable sized. It has a 1 byte header
+ * which sets the length of the packet (divided by 16). If it's 0,
+ * the metadata doesn't change. After the packet, icy_metaint bytes
+ * of normal data follows. */
uint8_t ch;
int len = http_read_stream_all(h, &ch, 1);
if (len < 0)
data[len + 1] = 0;
if ((ret = av_opt_set(s, "icy_metadata_packet", data, 0)) < 0)
return ret;
+ update_metadata(s, data);
}
s->icy_data_read = 0;
- remaining = s->icy_metaint;
+ remaining = s->icy_metaint;
}
return FFMIN(size, remaining);
snprintf(temp, sizeof(temp), "%x\r\n", size);
if ((ret = ffurl_write(s->hd, temp, strlen(temp))) < 0 ||
- (ret = ffurl_write(s->hd, buf, size)) < 0 ||
+ (ret = ffurl_write(s->hd, buf, size)) < 0 ||
(ret = ffurl_write(s->hd, crlf, sizeof(crlf) - 1)) < 0)
return ret;
}
#if CONFIG_ZLIB
inflateEnd(&s->inflate_stream);
av_freep(&s->inflate_buffer);
-#endif
+#endif /* CONFIG_ZLIB */
- if (!s->end_chunked_post) {
+ 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)
ffurl_close(s->hd);
if (whence == AVSEEK_SIZE)
return s->filesize;
+ else if ((whence == SEEK_CUR && off == 0) ||
+ (whence == SEEK_SET && off == s->off))
+ return s->off;
else if ((s->filesize == -1 && whence == SEEK_END) || h->is_streamed)
return AVERROR(ENOSYS);
memcpy(s->buffer, old_buf, old_buf_size);
s->buf_ptr = s->buffer;
s->buf_end = s->buffer + old_buf_size;
- s->hd = old_hd;
- s->off = old_off;
+ s->hd = old_hd;
+ s->off = old_off;
return ret;
}
av_dict_free(&options);
return off;
}
-static int
-http_get_file_handle(URLContext *h)
+static int http_get_file_handle(URLContext *h)
{
HTTPContext *s = h->priv_data;
return ffurl_get_file_handle(s->hd);
}
+#define HTTP_CLASS(flavor) \
+static const AVClass flavor ## _context_class = { \
+ .class_name = # flavor, \
+ .item_name = av_default_item_name, \
+ .option = options, \
+ .version = LIBAVUTIL_VERSION_INT, \
+}
+
#if CONFIG_HTTP_PROTOCOL
+HTTP_CLASS(http);
+
URLProtocol ff_http_protocol = {
.name = "http",
.url_open2 = http_open,
.priv_data_class = &http_context_class,
.flags = URL_PROTOCOL_FLAG_NETWORK,
};
-#endif
+#endif /* CONFIG_HTTP_PROTOCOL */
+
#if CONFIG_HTTPS_PROTOCOL
+HTTP_CLASS(https);
+
URLProtocol ff_https_protocol = {
.name = "https",
.url_open2 = http_open,
.priv_data_class = &https_context_class,
.flags = URL_PROTOCOL_FLAG_NETWORK,
};
-#endif
+#endif /* CONFIG_HTTPS_PROTOCOL */
#if CONFIG_HTTPPROXY_PROTOCOL
static int http_proxy_close(URLContext *h)
if ((ret = ffurl_write(s->hd, s->buffer, strlen(s->buffer))) < 0)
goto fail;
- s->buf_ptr = s->buffer;
- s->buf_end = s->buffer;
+ s->buf_ptr = s->buffer;
+ s->buf_end = s->buffer;
s->line_count = 0;
- s->filesize = -1;
+ s->filesize = -1;
cur_auth_type = s->proxy_auth_state.auth_type;
/* Note: This uses buffering, potentially reading more than the
.priv_data_size = sizeof(HTTPContext),
.flags = URL_PROTOCOL_FLAG_NETWORK,
};
-#endif
+#endif /* CONFIG_HTTPPROXY_PROTOCOL */
projects / ffmpeg / blobdiff