summaryrefslogtreecommitdiff
path: root/libavformat/http.c
diff options
context:
space:
mode:
authorDuncan Salerno <duncan.salerno@gmail.com>2012-10-02 22:22:44 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-10-05 05:13:28 +0200
commit8a33210d1b104db04743f127ea617ab40e2bcdda (patch)
treef969880b4842e7e591b55def9804ccb4537eb83a /libavformat/http.c
parentdd1e6b2a139a9eea61aefe24fc3295499e70d04b (diff)
http: prevent the Range header being sent when seekability probing isnt used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/http.c')
-rw-r--r--libavformat/http.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/http.c b/libavformat/http.c
index caedf1181e..d385011203 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -419,10 +419,10 @@ static int http_connect(URLContext *h, const char *path, const char *local_path,
if (!has_header(s->headers, "\r\nAccept: "))
len += av_strlcpy(headers + len, "Accept: */*\r\n",
sizeof(headers) - len);
- // Note: we send this on purpose even when s->off is 0,
+ // 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)
+ if (!has_header(s->headers, "\r\nRange: ") && !post && (s->off > 0 || s->seekable == -1))
len += av_strlcatf(headers + len, sizeof(headers) - len,
"Range: bytes=%"PRId64"-\r\n", s->off);