From ffaf2074ebbca70bdd02819f383710b34d168e31 Mon Sep 17 00:00:00 2001 From: Brandon Lees Date: Fri, 14 Nov 2014 18:05:44 -0500 Subject: [PATCH] Fix the timeout option not working when connecting to a HTTP url that requires authentication. In http_open_cnx, the patch restores the AVDictionary if connection needs to be re-tried because of a authentication/redirect status code. Previously, if a 401/407/30x status code was encountered, http_open_cnx would restart at the redo label, but any options used by the underlying protocol would be missing because they were removed by the first attempt. Signed-off-by: Brandon Lees Signed-off-by: Michael Niedermayer --- libavformat/http.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/http.c b/libavformat/http.c index dfc01eee4c..f17b2f8db8 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -207,6 +207,9 @@ static int http_open_cnx(URLContext *h, AVDictionary **options) HTTPContext *s = h->priv_data; int location_changed, attempts = 0, redirects = 0; redo: + if (attempts > 0) + av_dict_copy(options, s->chained_options, 0); + cur_auth_type = s->auth_state.auth_type; cur_proxy_auth_type = s->auth_state.auth_type;