On Fri, 1 Jun 2012, Martin Storsjö wrote:
This fixes issues with opening http urls that have authentication
or redirects, introduced in commit e999b641.
---
libavformat/http.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavformat/http.c b/libavformat/http.c
index 22600b4..61266df 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -161,6 +161,7 @@ static int http_open_cnx(URLContext *h)
if ((cur_auth_type == HTTP_AUTH_NONE || s->auth_state.stale) &&
s->auth_state.auth_type != HTTP_AUTH_NONE && attempts < 4) {
ffurl_close(hd);
+ s->hd = hd = NULL;
goto redo;
} else
goto fail;
@@ -169,6 +170,7 @@ static int http_open_cnx(URLContext *h)
if ((cur_proxy_auth_type == HTTP_AUTH_NONE || s->proxy_auth_state.stale)
&&
s->proxy_auth_state.auth_type != HTTP_AUTH_NONE && attempts < 4) {
ffurl_close(hd);
+ s->hd = hd = NULL;
goto redo;
} else
goto fail;
@@ -177,6 +179,7 @@ static int http_open_cnx(URLContext *h)
&& location_changed == 1) {
/* url moved, get next */
ffurl_close(hd);
+ s->hd = hd = NULL;
if (redirects++ >= MAX_REDIRECTS)
return AVERROR(EIO);
/* Restart the authentication process with the new target, which
--
1.7.9.4
OK'd by Kostya on irc, pushed (together with the two other cleanups/fixes
that already were approved).
// Martin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
