diff options
| author | Martin Storsjö <martin@martin.st> | 2012-03-12 13:59:53 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-03-13 10:36:18 +0200 |
| commit | 2f96cc1fc41f2d3a349d55f9d2078694a6a87dc1 (patch) | |
| tree | 942fad428db8ad27a1cacb3258d86f2b37f16fa5 | |
| parent | 8a3360d18ab148fad6b32b4a8e710f84cd9a45d2 (diff) | |
| download | ffmpeg-2f96cc1fc41f2d3a349d55f9d2078694a6a87dc1.tar.gz | |
rtsp: Retry authentication if failed due to being stale
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavformat/rtsp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 4290abbdc1..ecc1cbafef 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1122,7 +1122,7 @@ int ff_rtsp_send_cmd_with_content(AVFormatContext *s, { RTSPState *rt = s->priv_data; HTTPAuthType cur_auth_type; - int ret; + int ret, attempts = 0; retry: cur_auth_type = rt->auth_state.auth_type; @@ -1133,9 +1133,11 @@ retry: if ((ret = ff_rtsp_read_reply(s, reply, content_ptr, 0, method) ) < 0) return ret; + attempts++; - if (reply->status_code == 401 && cur_auth_type == HTTP_AUTH_NONE && - rt->auth_state.auth_type != HTTP_AUTH_NONE) + if (reply->status_code == 401 && + (cur_auth_type == HTTP_AUTH_NONE || rt->auth_state.stale) && + rt->auth_state.auth_type != HTTP_AUTH_NONE && attempts < 2) goto retry; if (reply->status_code > 400){ |