diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 00:11:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 00:12:56 +0200 |
| commit | e260c8180ec6c6a6258d2aa4fd19b43f8e79de3f (patch) | |
| tree | 1a2d70227c726c8e52c29b4412cfe7e01b898c6e /libavformat/http.c | |
| parent | a8db787932ad71ac4f77b61357b695c3b35a283d (diff) | |
| parent | 4e629ef80e62a54636cb46033998177dd08cf3ad (diff) | |
| download | ffmpeg-e260c8180ec6c6a6258d2aa4fd19b43f8e79de3f.tar.gz | |
Merge commit '4e629ef80e62a54636cb46033998177dd08cf3ad'
* commit '4e629ef80e62a54636cb46033998177dd08cf3ad':
http: Fix authentication, broken since 6a463e7fb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/http.c')
| -rw-r--r-- | libavformat/http.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index adbd01cb83..c0c2739c28 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -207,14 +207,14 @@ static int http_open_cnx(URLContext *h, AVDictionary **options) 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; + location_changed = http_open_cnx_internal(h, options); if (location_changed < 0) goto fail; attempts++; - cur_auth_type = s->auth_state.auth_type; - cur_proxy_auth_type = s->auth_state.auth_type; - if (s->http_code == 401) { if ((cur_auth_type == HTTP_AUTH_NONE || s->auth_state.stale) && s->auth_state.auth_type != HTTP_AUTH_NONE && attempts < 4) { |