virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

httpauth: Add space after commas in HTTP/RTSP auth header

Browse Source 
This fixes access to Grandstream cameras, which return 401 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.

See RFC 2617 (HTTP Auth).

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Andrey Utkin 2015-10-13 12:44:37 +03:00 committed by Luca Barbato
parent e55376a1fd
commit c134850669
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/httpauth.c
View File

@ -220,18 +220,19 @@ static char *make_digest_auth(HTTPAuthState *state, const char *username,
/* TODO: Escape the quoted strings properly. */ /* TODO: Escape the quoted strings properly. */
av_strlcatf(authstr, len, "username=\"%s\"", username); av_strlcatf(authstr, len, "username=\"%s\"", username);
av_strlcatf(authstr, len, ",realm=\"%s\"", state->realm); av_strlcatf(authstr, len, ", realm=\"%s\"", state->realm);
av_strlcatf(authstr, len, ",nonce=\"%s\"", digest->nonce); av_strlcatf(authstr, len, ", nonce=\"%s\"", digest->nonce);
av_strlcatf(authstr, len, ",uri=\"%s\"", uri); av_strlcatf(authstr, len, ", uri=\"%s\"", uri);
av_strlcatf(authstr, len, ",response=\"%s\"", response); av_strlcatf(authstr, len, ", response=\"%s\"", response);
if (digest->algorithm[0]) if (digest->algorithm[0])
av_strlcatf(authstr, len, ",algorithm=%s", digest->algorithm); av_strlcatf(authstr, len, ", algorithm=%s", digest->algorithm);
if (digest->opaque[0]) if (digest->opaque[0])
av_strlcatf(authstr, len, ",opaque=\"%s\"", digest->opaque); av_strlcatf(authstr, len, ", opaque=\"%s\"", digest->opaque);
if (digest->qop[0]) { if (digest->qop[0]) {
av_strlcatf(authstr, len, ",qop=\"%s\"", digest->qop); av_strlcatf(authstr, len, ", qop=\"%s\"", digest->qop);
av_strlcatf(authstr, len, ",cnonce=\"%s\"", cnonce); av_strlcatf(authstr, len, ", cnonce=\"%s\"", cnonce);
av_strlcatf(authstr, len, ",nc=%s", nc); av_strlcatf(authstr, len, ", nc=%s", nc);
} }
av_strlcatf(authstr, len, "\r\n"); av_strlcatf(authstr, len, "\r\n");