| @@ -327,12 +327,11 @@ static int process_line(URLContext *h, char *line, int line_count, | |||
| /* error codes are 4xx and 5xx, but regard 401 as a success, so we | |||
| * don't abort until all headers have been parsed. */ | |||
| if (s->http_code >= 400 && s->http_code < 600 && (s->http_code != 401 | |||
| || s->auth_state.auth_type != HTTP_AUTH_NONE) && | |||
| if (s->http_code >= 400 && s->http_code < 600 && | |||
| (s->http_code != 401 || s->auth_state.auth_type != HTTP_AUTH_NONE) && | |||
| (s->http_code != 407 || s->proxy_auth_state.auth_type != HTTP_AUTH_NONE)) { | |||
| end += strspn(end, SPACE_CHARS); | |||
| av_log(h, AV_LOG_WARNING, "HTTP error %d %s\n", | |||
| s->http_code, end); | |||
| av_log(h, AV_LOG_WARNING, "HTTP error %d %s\n", s->http_code, end); | |||
| return AVERROR(EIO); | |||
| } | |||
| } else { | |||
| @@ -356,34 +355,37 @@ static int process_line(URLContext *h, char *line, int line_count, | |||
| av_free(s->location); | |||
| s->location = new_loc; | |||
| *new_location = 1; | |||
| } else if (!av_strcasecmp (tag, "Content-Length") && s->filesize == -1) { | |||
| } else if (!av_strcasecmp(tag, "Content-Length") && s->filesize == -1) { | |||
| s->filesize = strtoll(p, NULL, 10); | |||
| } else if (!av_strcasecmp (tag, "Content-Range")) { | |||
| } else if (!av_strcasecmp(tag, "Content-Range")) { | |||
| /* "bytes $from-$to/$document_size" */ | |||
| const char *slash; | |||
| if (!strncmp (p, "bytes ", 6)) { | |||
| if (!strncmp(p, "bytes ", 6)) { | |||
| p += 6; | |||
| s->off = strtoll(p, NULL, 10); | |||
| if ((slash = strchr(p, '/')) && strlen(slash) > 0) | |||
| s->filesize = strtoll(slash+1, NULL, 10); | |||
| } | |||
| h->is_streamed = 0; /* we _can_ in fact seek */ | |||
| } else if (!av_strcasecmp(tag, "Accept-Ranges") && !strncmp(p, "bytes", 5)) { | |||
| } else if (!av_strcasecmp(tag, "Accept-Ranges") && | |||
| !strncmp(p, "bytes", 5)) { | |||
| h->is_streamed = 0; | |||
| } else if (!av_strcasecmp (tag, "Transfer-Encoding") && !av_strncasecmp(p, "chunked", 7)) { | |||
| } else if (!av_strcasecmp(tag, "Transfer-Encoding") && | |||
| !av_strncasecmp(p, "chunked", 7)) { | |||
| s->filesize = -1; | |||
| s->chunksize = 0; | |||
| } else if (!av_strcasecmp (tag, "WWW-Authenticate")) { | |||
| } else if (!av_strcasecmp(tag, "WWW-Authenticate")) { | |||
| ff_http_auth_handle_header(&s->auth_state, tag, p); | |||
| } else if (!av_strcasecmp (tag, "Authentication-Info")) { | |||
| } else if (!av_strcasecmp(tag, "Authentication-Info")) { | |||
| ff_http_auth_handle_header(&s->auth_state, tag, p); | |||
| } else if (!av_strcasecmp (tag, "Proxy-Authenticate")) { | |||
| } else if (!av_strcasecmp(tag, "Proxy-Authenticate")) { | |||
| ff_http_auth_handle_header(&s->proxy_auth_state, tag, p); | |||
| } else if (!av_strcasecmp (tag, "Connection")) { | |||
| } else if (!av_strcasecmp(tag, "Connection")) { | |||
| if (!strcmp(p, "close")) | |||
| s->willclose = 1; | |||
| } else if (!av_strcasecmp (tag, "Content-Encoding")) { | |||
| if (!av_strncasecmp(p, "gzip", 4) || !av_strncasecmp(p, "deflate", 7)) { | |||
| } else if (!av_strcasecmp(tag, "Content-Encoding")) { | |||
| if (!av_strncasecmp(p, "gzip", 4) || | |||
| !av_strncasecmp(p, "deflate", 7)) { | |||
| #if CONFIG_ZLIB | |||
| s->compressed = 1; | |||
| inflateEnd(&s->inflate_stream); | |||