<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173955] releases/WebKitGTK/webkit-2.4</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173955">173955</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-25 06:25:01 -0700 (Thu, 25 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/173809">r173809</a> - [GStreamer] Cannot play Vimeo video
https://bugs.webkit.org/show_bug.cgi?id=134969
Reviewed by Sergio Villar Senin.
Source/WebCore:
Ensure the GStreamer HTTP source element also sends cookies when
it's sending its requests. Some streaming platforms such as Vimeo
do server-side cookie checks on incoming requests before serving
media data.
Test: http/tests/media/hls/video-cookie.html
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(webKitWebSrcStart): Set first-party cookie URL to the request so
the ResourceLoader properly sets cookies in the HTTP request.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestshttptestsmediaresourcesvideocookiecheckcookiephp">releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/resources/video-cookie-check-cookie.php</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/hls/</li>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestshttptestsmediahlsvideocookieexpectedtxt">releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/hls/video-cookie-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestshttptestsmediahlsvideocookiehtml">releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/hls/video-cookie.html</a></li>
<li>releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/resources/hls/</li>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestshttptestsmediaresourceshlsplaylistwithcookiem3u8">releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/resources/hls/playlist-with-cookie.m3u8</a></li>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestshttptestsmediaresourceshlssubplaylistwithcookiephp">releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/resources/hls/sub-playlist-with-cookie.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog (173954 => 173955)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2014-09-25 13:13:39 UTC (rev 173954)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2014-09-25 13:25:01 UTC (rev 173955)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-09-17 Philippe Normand <pnormand@igalia.com>
+
+ [GStreamer] Cannot play Vimeo video
+ https://bugs.webkit.org/show_bug.cgi?id=134969
+
+ Reviewed by Sergio Villar Senin.
+
+ New test for a HLS stream enforcing a specific cookie before
+ serving its fragments, like Vimeo does.
+
+ * http/tests/media/hls/video-cookie-expected.txt: Added.
+ * http/tests/media/hls/video-cookie.html: Added.
+ * http/tests/media/resources/hls/playlist-with-cookie.m3u8: Added.
+ * http/tests/media/resources/hls/sub-playlist-with-cookie.php: Added.
+ * http/tests/media/resources/video-cookie-check-cookie.php:
+ * platform/gtk/TestExpectations: Marked test as slow, as the other
+ HLS test.
+
</ins><span class="cx"> 2014-08-18 Diego Pino Garcia <dpino@igalia.com>
</span><span class="cx">
</span><span class="cx"> Completed iterator can be revived by adding more than one new entry to the target object
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestshttptestsmediahlsvideocookieexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/hls/video-cookie-expected.txt (0 => 173955)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/hls/video-cookie-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/hls/video-cookie-expected.txt 2014-09-25 13:25:01 UTC (rev 173955)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+
+EVENT(play)
+END OF TEST
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestshttptestsmediahlsvideocookiehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/hls/video-cookie.html (0 => 173955)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/hls/video-cookie.html (rev 0)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/hls/video-cookie.html 2014-09-25 13:25:01 UTC (rev 173955)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src=../../media-resources/video-test.js></script>
+ <script src=../../media-resources/media-controls.js></script>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setAlwaysAcceptCookies(true);
+ testRunner.waitUntilDone();
+ }
+
+ function start() {
+ video = document.getElementById('video');
+ waitForEventAndEnd('play');
+ waitForEventAndFail('stalled');
+ video.src = "../resources/hls/playlist-with-cookie.m3u8";
+ }
+ </script>
+ </head>
+ <body onload="start()">
+ <video id="video" autoplay></video>
+ </body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestshttptestsmediaresourceshlsplaylistwithcookiem3u8"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/resources/hls/playlist-with-cookie.m3u8 (0 => 173955)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/resources/hls/playlist-with-cookie.m3u8 (rev 0)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/resources/hls/playlist-with-cookie.m3u8 2014-09-25 13:25:01 UTC (rev 173955)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+#EXTM3U
+
+#EXT-X-STREAM-INF:PROGRAM-ID=1
+sub-playlist-with-cookie.php
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestshttptestsmediaresourceshlssubplaylistwithcookiephp"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/resources/hls/sub-playlist-with-cookie.php (0 => 173955)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/resources/hls/sub-playlist-with-cookie.php (rev 0)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/resources/hls/sub-playlist-with-cookie.php 2014-09-25 13:25:01 UTC (rev 173955)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<?php
+# See the HLS ITEF spec: <http://tools.ietf.org/id/draft-pantos-http-live-streaming-12.txt>
+header("Status: 200 OK");
+header("HTTP/1.1 200 OK");
+header("Connection: close");
+header('Cache-Control: no-store, no-cache="set-cookie"\n');
+header("Access-Control-Allow-Origin: *");
+header("Etag: " . '"' . filesize(__FILE__) . "-" . filemtime(__FILE__) . '"');
+header("Set-Cookie: TEST=test.ts; path=/media/resources/");
+header("Content-Type: application/x-mpegurl");
+header("Content-Length: " . filesize(__FILE__));
+
+$chunkDuration = 6.0272;
+$chunkCount = 4;
+
+function println($string) { return print($string . PHP_EOL); }
+
+println("#EXTM3U");
+println("#EXT-X-TARGETDURATION:7");
+println("#EXT-X-VERSION:4");
+println("#EXT-X-MEDIA-SEQUENCE:" . (time() / $chunkDuration % 100));
+
+$time = time();
+$time = $time - $time % $chunkDuration;
+
+for ($i = 0; $i < $chunkCount; ++$i) {
+ $time += 6;
+ println("#EXT-X-PROGRAM-DATE-TIME:" . gmdate("c", $time));
+ println("#EXTINF:" . $chunkDuration . ",");
+ println("../video-cookie-check-cookie.php");
+}
+?>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestshttptestsmediaresourcesvideocookiecheckcookiephp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/resources/video-cookie-check-cookie.php (173954 => 173955)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/resources/video-cookie-check-cookie.php 2014-09-25 13:13:39 UTC (rev 173954)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/http/tests/media/resources/video-cookie-check-cookie.php 2014-09-25 13:25:01 UTC (rev 173955)
</span><span class="lines">@@ -1,14 +1,16 @@
</span><span class="cx"> <?php
</span><span class="cx"> if($_COOKIE["TEST"])
</span><span class="cx"> {
</span><del>- $extension = substr($_COOKIE["TEST"], -3);
-
</del><ins>+ $extension = pathinfo($_COOKIE["TEST"], PATHINFO_EXTENSION);
</ins><span class="cx"> if ($extension == 'mp4') {
</span><span class="cx"> header("Content-Type: video/mp4");
</span><span class="cx"> $fileName = "test.mp4";
</span><span class="cx"> } else if ($extension == 'ogv') {
</span><span class="cx"> header("Content-Type: video/ogg");
</span><span class="cx"> $fileName = "test.ogv";
</span><ins>+ } else if ($extension == 'ts') {
+ header("Content-Type: video/mpegts");
+ $fileName = "hls/test.ts";
</ins><span class="cx"> } else
</span><span class="cx"> die;
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (173954 => 173955)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-09-25 13:13:39 UTC (rev 173954)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-09-25 13:25:01 UTC (rev 173955)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-09-17 Philippe Normand <pnormand@igalia.com>
+
+ [GStreamer] Cannot play Vimeo video
+ https://bugs.webkit.org/show_bug.cgi?id=134969
+
+ Reviewed by Sergio Villar Senin.
+
+ Ensure the GStreamer HTTP source element also sends cookies when
+ it's sending its requests. Some streaming platforms such as Vimeo
+ do server-side cookie checks on incoming requests before serving
+ media data.
+
+ Test: http/tests/media/hls/video-cookie.html
+
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+ (webKitWebSrcStart): Set first-party cookie URL to the request so
+ the ResourceLoader properly sets cookies in the HTTP request.
+
</ins><span class="cx"> 2014-08-07 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> HTML <sub> and <sup> elements do not work in some 64-bit builds
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (173954 => 173955)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2014-09-25 13:13:39 UTC (rev 173954)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2014-09-25 13:25:01 UTC (rev 173955)
</span><span class="lines">@@ -494,6 +494,7 @@
</span><span class="cx">
</span><span class="cx"> ResourceRequest request(url);
</span><span class="cx"> request.setAllowCookies(true);
</span><ins>+ request.setFirstPartyForCookies(url);
</ins><span class="cx">
</span><span class="cx"> if (priv->player)
</span><span class="cx"> request.setHTTPReferrer(priv->player->referrer());
</span></span></pre>
</div>
</div>
</body>
</html>