From 30af077942478b71823d4d04aeed2b8889e92c65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Thu, 25 Mar 2010 21:49:43 +0000
Subject: [PATCH] Don't force basic auth in RTSP, but retry with the
server-specified method on failure
Originally committed as revision 22678 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/rtsp.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index f0ec5982add..fd6112e9b0e 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1060,10 +1060,19 @@ void ff_rtsp_send_cmd_with_content(AVFormatContext *s,
const unsigned char *send_content,
int send_content_length)
{
+ RTSPState *rt = s->priv_data;
+ HTTPAuthType cur_auth_type;
+
+retry:
+ cur_auth_type = rt->auth_state.auth_type;
ff_rtsp_send_cmd_with_content_async(s, method, url, header,
send_content, send_content_length);
ff_rtsp_read_reply(s, reply, content_ptr, 0);
+
+ if (reply->status_code == 401 && cur_auth_type == HTTP_AUTH_NONE &&
+ rt->auth_state.auth_type != HTTP_AUTH_NONE)
+ goto retry;
}
/**
@@ -1447,7 +1456,6 @@ redirect:
host, sizeof(host), &port, path, sizeof(path), s->filename);
if (*auth) {
av_strlcpy(rt->auth, auth, sizeof(rt->auth));
- rt->auth_state.auth_type = HTTP_AUTH_BASIC;
}
if (port < 0)
port = RTSP_DEFAULT_PORT;
--
GitLab