diff options
| author | Joakim Plate <elupus@ecce.se> | 2014-01-24 11:21:55 -0800 |
|---|---|---|
| committer | Joakim Plate <elupus@ecce.se> | 2014-01-24 11:21:55 -0800 |
| commit | be0ee21e47817cddc9fb20b48e7510203c597fed (patch) | |
| tree | 0f66e80da75e26586163fc9705440e9420820ee6 /lib | |
| parent | 6d34f22b3cb08b0d9ef06d1d02b5529395605dac (diff) | |
| parent | 1299a912ec0fb3b76116521fd82c6a777f27b84a (diff) | |
Merge pull request #4081 from voguemaster/master
ffmpeg: Correctly handle cookies that specify a sub-domain.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ffmpeg/libavformat/http.c | 5 | ||||
| -rw-r--r-- | lib/ffmpeg/patches/0061-ffmpeg-backport-Correctly-handle-cookies-that-specify-a-sub-domain.patch | 29 |
2 files changed, 33 insertions, 1 deletions
diff --git a/lib/ffmpeg/libavformat/http.c b/lib/ffmpeg/libavformat/http.c index 1e3cff7947..ef81d14055 100644 --- a/lib/ffmpeg/libavformat/http.c +++ b/lib/ffmpeg/libavformat/http.c @@ -409,8 +409,11 @@ static int get_cookies(HTTPContext *s, char **cookies, const char *path, av_free(cpath); cpath = av_strdup(¶m[5]); } else if (!av_strncasecmp("domain=", param, 7)) { + // if the cookie specifies a sub-domain, skip the leading dot thereby + // supporting URLs that point to sub-domains and the master domain + int leading_dot = (param[7] == '.'); av_free(cdomain); - cdomain = av_strdup(¶m[7]); + cdomain = av_strdup(¶m[7+leading_dot]); } else if (!av_strncasecmp("secure", param, 6) || !av_strncasecmp("comment", param, 7) || !av_strncasecmp("max-age", param, 7) || diff --git a/lib/ffmpeg/patches/0061-ffmpeg-backport-Correctly-handle-cookies-that-specify-a-sub-domain.patch b/lib/ffmpeg/patches/0061-ffmpeg-backport-Correctly-handle-cookies-that-specify-a-sub-domain.patch new file mode 100644 index 0000000000..1e894f83d2 --- /dev/null +++ b/lib/ffmpeg/patches/0061-ffmpeg-backport-Correctly-handle-cookies-that-specify-a-sub-domain.patch @@ -0,0 +1,29 @@ +From aa1852f88f769ee438e85cec8552ff545914885c Mon Sep 17 00:00:00 2001 +From: Eli K. <eli@algotec.co.il> +Date: Thu, 23 Jan 2014 10:27:21 +0200 +Subject: [PATCH] Correctly handle cookies that specify a sub-domain. + +--- + libavformat/http.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/libavformat/http.c b/libavformat/http.c +index 3b655c6..69c4d6d 100644 +--- a/libavformat/http.c ++++ b/libavformat/http.c +@@ -490,8 +490,11 @@ static int get_cookies(HTTPContext *s, char **cookies, const char *path, + av_free(cpath); + cpath = av_strdup(¶m[5]); + } else if (!av_strncasecmp("domain=", param, 7)) { ++ // if the cookie specifies a sub-domain, skip the leading dot thereby ++ // supporting URLs that point to sub-domains and the master domain ++ int leading_dot = (param[7] == '.'); + av_free(cdomain); +- cdomain = av_strdup(¶m[7]); ++ cdomain = av_strdup(¶m[7+leading_dot]); + } else if (!av_strncasecmp("secure", param, 6) || + !av_strncasecmp("comment", param, 7) || + !av_strncasecmp("max-age", param, 7) || +-- +1.8.3.msysgit.0 + |