summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2013-03-17 10:50:41 +0000
committerwm4 <wm4@nowhere>2013-04-04 14:08:07 +0200
commita98f658d53224f301211dd1ce1e9da5ee3cb042f (patch)
tree4df55a04c638a6ba41464de817e765630d6266a7 /stream
parentdac77448881146c5bd4df0346cd152fa3b6fce9a (diff)
downloadmpv-a98f658d53224f301211dd1ce1e9da5ee3cb042f.tar.bz2
mpv-a98f658d53224f301211dd1ce1e9da5ee3cb042f.tar.xz
http: handle broken QuickTime Streaming Server headers
Handle the severely broken headers QuickTime Streaming Server sends. Instead of ending the header with \r\n\r\n it ends with \r\n<4 byte MP3 header>\r\n. And programs like wget just silently accept this without even printing a warning!! git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35988 b3059339-0415-0410-9bf9-f77b7e298cf2 Note: see previous commit.
Diffstat (limited to 'stream')
-rw-r--r--stream/http.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/stream/http.c b/stream/http.c
index c94d6d4925..eb0ea701b6 100644
--- a/stream/http.c
+++ b/stream/http.c
@@ -350,6 +350,7 @@ http_is_header_entire( HTTP_header_t *http_hdr ) {
if( http_hdr==NULL ) return -1;
if( http_hdr->buffer==NULL ) return 0; // empty
+ if(http_hdr->buffer_size > 128*1024) return 1;
if( strstr(http_hdr->buffer, "\r\n\r\n")==NULL &&
strstr(http_hdr->buffer, "\n\n")==NULL ) return 0;
return 1;
@@ -414,12 +415,12 @@ http_response_parse( HTTP_header_t *http_hdr ) {
hdr_sep_len = 4;
ptr = strstr( http_hdr->buffer, "\r\n\r\n" );
if( ptr==NULL ) {
+ hdr_sep_len = 2;
ptr = strstr( http_hdr->buffer, "\n\n" );
if( ptr==NULL ) {
mp_msg(MSGT_NETWORK,MSGL_ERR,"Header may be incomplete. No CRLF CRLF found.\n");
- return -1;
+ hdr_sep_len = 0;
}
- hdr_sep_len = 2;
}
pos_hdr_sep = ptr-http_hdr->buffer;
@@ -429,7 +430,12 @@ http_response_parse( HTTP_header_t *http_hdr ) {
ptr = hdr_ptr;
while( *ptr!='\r' && *ptr!='\n' ) ptr++;
len = ptr-hdr_ptr;
- if( len==0 ) break;
+ if (len == 0 || !memchr(hdr_ptr, ':', len)) {
+ mp_msg(MSGT_NETWORK, MSGL_ERR, "Broken response header, missing ':'\n");
+ pos_hdr_sep = ptr - http_hdr->buffer;
+ hdr_sep_len = 0;
+ break;
+ }
if (len > 16 && !strncasecmp(hdr_ptr + 4, "icy-metaint:", 12))
{
mp_msg(MSGT_NETWORK, MSGL_WARN, "Server sent a severely broken icy-metaint HTTP header!\n");