Michael Niedermayer
8b59ab1af0
Merge commit ' ce2e858f5b'
...
* commit 'ce2e858f5b
2014-07-24 02:08:14 +02:00
Diego Biurrun
ce2e858f5b
http: K&R formatting cosmetics
...
Also comment some #endifs and reshuffle headers into canonical order.
2014-07-23 13:57:24 -07:00
Michael Niedermayer
016cca4504
Merge commit ' 7bdd2ff682'
...
* commit '7bdd2ff682
2014-07-22 22:02:48 +02:00
Luca Barbato
7bdd2ff682
http: Use a constant for the supported header size
2014-07-22 16:38:26 +02:00
Michael Niedermayer
ab7c67905d
Merge commit ' 389380c279'
...
* commit '389380c279
2014-07-22 03:00:06 +02:00
Michael Niedermayer
e621e6cac6
Merge commit ' 28df1d2411'
...
* commit '28df1d2411
2014-07-22 02:51:35 +02:00
Luca Barbato
389380c279
http: Do move the class instantiation in the conditional block
...
Remove a warning if https support is disabled.
2014-07-21 22:18:35 +02:00
Luca Barbato
28df1d2411
http: Provide an option to override the HTTP method
...
Certain servers accept only PUT as valid method.
2014-07-21 22:18:35 +02:00
Michael Niedermayer
56193d33be
avformat/http: remove never twice executable loop
...
Fixes CID1197069
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-14 20:44:15 +02:00
wm4
686e662676
http: restructure http_connect error handling path
...
The authstr memory allocations make it annoying to error in the middle
of the header setup code, so apply the usual C error handling idiom to
make it easier to error at any point.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-23 05:56:35 +01:00
wm4
76c8fbc5f2
http: never send 'Cookie: (null)' to the server
...
If a domain has some cookies set, but matching the cookie fails due to
the port being different, get_cookies() succeeds, but sets cookies to
NULL. The caller of get_cookies() didn't check for the NULL value.
This also avoids passing NULL to libc string functions, which is
undefined behavior
Fixes Ticket2180
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-21 20:32:09 +01:00
Michael Niedermayer
11ed7ec092
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
http: Properly initialize icy headers string
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 23:24:19 +01:00
Michael Niedermayer
7e6c6c45ec
Merge commit ' e77a2ea950'
...
* commit 'e77a2ea950
2014-03-12 20:50:29 +01:00
Alessandro Ghedini
6998a9f4c4
http: Properly initialize icy headers string
...
The icy_metadata_headers string never gets initialized, so,
during the first call to av_strlcatf() in parse_icy(),
strlen() will be called on a pointer to uninitialized memory.
At best this causes some garbage data to be left at the
start of the string.
By initializing icy_metadata_headers to the empty string, the
first call to strlen() will always return 0, so that data is
appended from the start of the string.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-12 20:13:36 +01:00
Martin Storsjö
e77a2ea950
http: Declare more parameters as const where possible
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-12 13:24:58 +02:00
Michael Niedermayer
cd25412f59
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
http: Allow setting a Content-Type for POST requests
Conflicts:
libavformat/http.c
See: c01d1d4ddf
2014-03-12 04:53:54 +01:00
Michael Niedermayer
1cc9468289
Merge commit ' ab76d9f628'
...
* commit 'ab76d9f628857841c1b6
2014-03-12 04:29:54 +01:00
Michael Niedermayer
76a939d0e5
Merge commit ' 2ec33d2712'
...
* commit '2ec33d2712d52882faef
2014-03-12 04:12:30 +01:00
Michael Niedermayer
f36da16ede
Merge commit ' ddfc989063'
...
* commit 'ddfc9890632bb1c713cc
2014-03-12 03:45:16 +01:00
Michael Niedermayer
c03af3ac1c
Merge commit ' e58c85b068'
...
* commit 'e58c85b06876d851b65620899c54f0255ec768da
2014-03-12 03:33:14 +01:00
Michael Niedermayer
ca2369cdee
Merge commit ' 8075c3d8bb'
...
* commit '8075c3d8bba92fbe16f2636273d3d4
2014-03-12 03:18:12 +01:00
Michael Niedermayer
21d4c571fa
Merge commit ' 4ff99ab3d7'
...
* commit '4ff99ab3d7
2014-03-12 02:52:17 +01:00
Michael Niedermayer
df41cbee85
Merge commit ' 7a2fddb448'
...
* commit '7a2fddb448
2014-03-12 02:45:34 +01:00
Michael Niedermayer
b752d02f42
Merge commit ' 78b21c1d71'
...
* commit '78b21c1d71
2014-03-12 02:39:46 +01:00
Michael Niedermayer
03fd80dcb1
Merge commit ' 55a215ba63'
...
* commit '55a215ba63
2014-03-12 02:34:02 +01:00
Clément Bœsch
2572d07c1f
http: Allow setting a Content-Type for POST requests
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-11 22:08:57 +01:00
Anssi Hannula
ab76d9f628
http: Always allow no-op seek
...
This also allows checking stream position as per ffurl_seek() doxy.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-11 22:08:57 +01:00
Anssi Hannula
2ec33d2712
http: Add support for selecting a request range
...
Comment from Reimar Döffinger included as pro memoria.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-11 22:08:57 +01:00
Clément Bœsch
ddfc989063
http: Support setting custom User-Agent
...
Contextually make the default User-Agent use the common
"Name/Version" pattern.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-11 22:08:57 +01:00
Michael Niedermayer
e58c85b068
http: Export Content-Type information
...
Bug-Id: https://bugs.debian.org/740421
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-11 22:08:57 +01:00
Luca Barbato
8075c3d8bb
http: Add support reading ICY metadata
...
Export the metadata as a icy_metadata_packet avoption.
Based on the work of wm4 and Alessandro Ghedini.
Bug-Id: https://bugs.debian.org/739936
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-11 22:08:57 +01:00
Alessandro Ghedini
fe568b3d27
http: Improve options descriptions
...
Add documentation where missing.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-11 22:08:57 +01:00
Luca Barbato
4ff99ab3d7
http: Refactor process_line
2014-03-11 22:08:56 +01:00
Luca Barbato
7a2fddb448
http: K&R formatting cosmetics
2014-03-11 22:08:56 +01:00
Luca Barbato
78b21c1d71
http: Drop doxy comments
2014-03-11 22:08:56 +01:00
Luca Barbato
55a215ba63
http: Return meaningful error codes
2014-03-11 22:08:56 +01:00
Michael Niedermayer
c832bf0c38
Merge remote-tracking branch 'lukaszmluki/master'
...
* lukaszmluki/master:
lavd/avdevice: always free detected devices on error
lavf/http: return error from seek on invalid whence
lavf/http: return error on seeking to negative postion
lavf/avio: fix ffurl_alloc error checks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06 02:04:18 +01:00
Lukasz Marek
1aa262f460
lavf/http: return error from seek on invalid whence
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-03-06 00:32:24 +01:00
Lukasz Marek
4ba6a534dc
lavf/http: return error on seeking to negative postion
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-03-06 00:32:20 +01:00
wm4
636273d3d4
http: handle ICY in presence of chunked transfer encoding
...
Some http servers send an ICY stream in combination with chunked
transfer encoding. This case was handled incorrectly by the ICY code:
instead of handling chunked encoding before anything ICY related, both
were mixed.
Fix this by separating the ICY code from normal http reading. Move the
normal http reading to a new function http_read_stream(), while
http_read() handles ICY on top of http_read_stream().
The server identified itself as: cloudflare-nginx
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05 22:49:36 +01:00
Eli Kara
da25a6573f
avformat/http: Properly handle cookies that specify sub-domain where the URL.
...
Fixes ticket #3336
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-23 14:39:36 +01:00
Anssi Hannula
857841c1b6
avformat/http: always allow no-op seek
...
This also allows checking stream position as per ffurl_seek() doxy.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
2014-01-03 15:05:48 +02:00
Anssi Hannula
d52882faef
avformat/http: allow the caller to select a request range
...
Add AVOptions for setting the initial offset and the ending offset, so
they can be used for setting an appropriate Range header.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
2013-12-31 03:18:53 +02:00
Michael Niedermayer
15b2ec57cc
Merge commit ' be4edda673'
...
* commit 'be4edda673
2013-11-22 17:48:45 +01:00
Michael Niedermayer
1d19f1b196
Merge commit ' 393d80cc27'
...
* commit '393d80cc274a4c93cb3f
2013-11-22 17:41:45 +01:00
Michael Niedermayer
6d648dcfc9
Merge commit ' 76267ecc82'
...
* commit '76267ecc82
2013-11-22 17:18:52 +01:00
Martin Storsjö
be4edda673
http: Expose the content location via an AVOption
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-11-22 14:27:07 +02:00
Zhang Rui
393d80cc27
http: Support relative URL redirection
...
In RFC 2616, this was explicitly said to be an absolute URL,
while in an upcoming draft [1] it is allowed to be relative as well.
[1] http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-25#section-7.1.2
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-11-22 14:27:04 +02:00
Martin Storsjö
76267ecc82
http: Remove an unrelated and mistakenly set AVOption unit name
...
This was due to a copypaste oversight.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-11-22 14:27:01 +02:00
Michael Niedermayer
04047b6166
avformat/http: print http headers at AV_LOG_DEBUG level
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-05 01:38:08 +01:00
