virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

Don't force basic auth in RTSP, but retry with the server-specified method on failure

Browse Source 
Originally committed as revision 22678 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-03-25 21:49:43 +00:00
parent 2626308abb
commit 30af077942
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/rtsp.c
View File

@ -1060,10 +1060,19 @@ void ff_rtsp_send_cmd_with_content(AVFormatContext *s,
const unsigned char *send_content, const unsigned char *send_content,
int send_content_length) 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, ff_rtsp_send_cmd_with_content_async(s, method, url, header,
send_content, send_content_length); send_content, send_content_length);
ff_rtsp_read_reply(s, reply, content_ptr, 0); 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); host, sizeof(host), &port, path, sizeof(path), s->filename);
if (*auth) { if (*auth) {
av_strlcpy(rt->auth, auth, sizeof(rt->auth)); av_strlcpy(rt->auth, auth, sizeof(rt->auth));
rt->auth_state.auth_type = HTTP_AUTH_BASIC;
} }
if (port < 0) if (port < 0)
port = RTSP_DEFAULT_PORT; port = RTSP_DEFAULT_PORT;