From: Andrey Utkin <andrey.ut...@corp.bluecherry.net>
This fixes access to Grandstream cameras, which return 401 to ffmpeg
otherwise.
VLC sends Authorization: header with spaces between parameters, and it
is known to work with Grandstream devices and broad range of other HTTP
and RTSP servers, so author considers switching to such behaviour safe.
Just for record - RFC 2617 (HTTP Auth) does not specify the need in
spaces, so this is not a bug of libavformat.
---
libavformat/httpauth.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/libavformat/httpauth.c b/libavformat/httpauth.c
index 403b166..5eccfc5 100644
--- a/libavformat/httpauth.c
+++ b/libavformat/httpauth.c
@@ -220,21 +220,21 @@ static char *make_digest_auth(HTTPAuthState *state, const
char *username,
/* TODO: Escape the quoted strings properly. */
av_strlcatf(authstr, len, "username=\"%s\"", username);
- av_strlcatf(authstr, len, ",realm=\"%s\"", state->realm);
- av_strlcatf(authstr, len, ",nonce=\"%s\"", digest->nonce);
- av_strlcatf(authstr, len, ",uri=\"%s\"", uri);
- av_strlcatf(authstr, len, ",response=\"%s\"", response);
+ av_strlcatf(authstr, len, ", realm=\"%s\"", state->realm);
+ av_strlcatf(authstr, len, ", nonce=\"%s\"", digest->nonce);
+ av_strlcatf(authstr, len, ", uri=\"%s\"", uri);
+ av_strlcatf(authstr, len, ", response=\"%s\"", response);
// we are violating the RFC and use "" because all others seem to do that
too.
if (digest->algorithm[0])
- av_strlcatf(authstr, len, ",algorithm=\"%s\"", digest->algorithm);
+ av_strlcatf(authstr, len, ", algorithm=\"%s\"", digest->algorithm);
if (digest->opaque[0])
- av_strlcatf(authstr, len, ",opaque=\"%s\"", digest->opaque);
+ av_strlcatf(authstr, len, ", opaque=\"%s\"", digest->opaque);
if (digest->qop[0]) {
- av_strlcatf(authstr, len, ",qop=\"%s\"", digest->qop);
- av_strlcatf(authstr, len, ",cnonce=\"%s\"", cnonce);
- av_strlcatf(authstr, len, ",nc=%s", nc);
+ av_strlcatf(authstr, len, ", qop=\"%s\"", digest->qop);
+ av_strlcatf(authstr, len, ", cnonce=\"%s\"", cnonce);
+ av_strlcatf(authstr, len, ", nc=%s", nc);
}
av_strlcatf(authstr, len, "\r\n");
--
2.3.8 (Apple Git-58)
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
