Merge commit '4e629ef80e62a54636cb46033998177dd08cf3ad'

* commit '4e629ef80e62a54636cb46033998177dd08cf3ad': http: Fix authentication, broken since 6a463e7fb Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · e260c8180e
parent a8db787932 4e629ef80e
commit e260c8180e
1 changed files with 3 additions and 3 deletions
--- 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) {