<!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>[173823] releases/WebKitGTK/webkit-2.6</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/173823">173823</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-22 02:42:55 -0700 (Mon, 22 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.

LayoutTests:

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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestshttptestsmediaresourcesvideocookiecheckcookiephp">releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/media/resources/video-cookie-check-cookie.php</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsplatformgtkTestExpectations">releases/WebKitGTK/webkit-2.6/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsplatformmacTestExpectations">releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestshttptestsmediahlsvideocookieexpectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/media/hls/video-cookie-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestshttptestsmediahlsvideocookiehtml">releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/media/hls/video-cookie.html</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestshttptestsmediaresourceshlsplaylistwithcookiem3u8">releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/media/resources/hls/playlist-with-cookie.m3u8</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestshttptestsmediaresourceshlssubplaylistwithcookiephp">releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/media/resources/hls/sub-playlist-with-cookie.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog (173822 => 173823)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog        2014-09-22 09:37:47 UTC (rev 173822)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog        2014-09-22 09:42:55 UTC (rev 173823)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-09-17  Philippe Normand  &lt;pnormand@igalia.com&gt;
+
+        [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-09-18  Daniel Bates  &lt;dabates@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r168921): SVG elements may be unnecessarily rebuilt
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestshttptestsmediahlsvideocookieexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/media/hls/video-cookie-expected.txt (0 => 173823)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/media/hls/video-cookie-expected.txt                                (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/media/hls/video-cookie-expected.txt        2014-09-22 09:42:55 UTC (rev 173823)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+
+EVENT(play)
+END OF TEST
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestshttptestsmediahlsvideocookiehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/media/hls/video-cookie.html (0 => 173823)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/media/hls/video-cookie.html                                (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/media/hls/video-cookie.html        2014-09-22 09:42:55 UTC (rev 173823)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+    &lt;head&gt;
+        &lt;script src=../../media-resources/video-test.js&gt;&lt;/script&gt;
+        &lt;script src=../../media-resources/media-controls.js&gt;&lt;/script&gt;
+        &lt;script&gt;
+            if (window.testRunner) {
+                testRunner.dumpAsText();
+                testRunner.setAlwaysAcceptCookies(true);
+                testRunner.waitUntilDone();
+            }
+
+            function start() {
+                video = document.getElementById('video');
+                waitForEventAndEnd('play');
+                waitForEventAndFail('stalled');
+                video.src = &quot;../resources/hls/playlist-with-cookie.m3u8&quot;;
+            }
+        &lt;/script&gt;
+    &lt;/head&gt;
+    &lt;body onload=&quot;start()&quot;&gt;
+        &lt;video id=&quot;video&quot; autoplay&gt;&lt;/video&gt;
+    &lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestshttptestsmediaresourceshlsplaylistwithcookiem3u8"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/media/resources/hls/playlist-with-cookie.m3u8 (0 => 173823)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/media/resources/hls/playlist-with-cookie.m3u8                                (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/media/resources/hls/playlist-with-cookie.m3u8        2014-09-22 09:42:55 UTC (rev 173823)
</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="releasesWebKitGTKwebkit26LayoutTestshttptestsmediaresourceshlssubplaylistwithcookiephp"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/media/resources/hls/sub-playlist-with-cookie.php (0 => 173823)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/media/resources/hls/sub-playlist-with-cookie.php                                (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/media/resources/hls/sub-playlist-with-cookie.php        2014-09-22 09:42:55 UTC (rev 173823)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+&lt;?php
+# See the HLS ITEF spec: &lt;http://tools.ietf.org/id/draft-pantos-http-live-streaming-12.txt&gt;
+header(&quot;Status: 200 OK&quot;);
+header(&quot;HTTP/1.1 200 OK&quot;);
+header(&quot;Connection: close&quot;);
+header('Cache-Control: no-store, no-cache=&quot;set-cookie&quot;\n');
+header(&quot;Access-Control-Allow-Origin: *&quot;);
+header(&quot;Etag: &quot; . '&quot;' . filesize(__FILE__) . &quot;-&quot; . filemtime(__FILE__) . '&quot;');
+header(&quot;Set-Cookie: TEST=test.ts; path=/media/resources/&quot;);
+header(&quot;Content-Type: application/x-mpegurl&quot;);
+header(&quot;Content-Length: &quot; . filesize(__FILE__));
+
+$chunkDuration = 6.0272;
+$chunkCount = 4;
+
+function println($string) { return print($string . PHP_EOL); }
+
+println(&quot;#EXTM3U&quot;);
+println(&quot;#EXT-X-TARGETDURATION:7&quot;);
+println(&quot;#EXT-X-VERSION:4&quot;);
+println(&quot;#EXT-X-MEDIA-SEQUENCE:&quot; . (time() / $chunkDuration % 100));
+
+$time = time();
+$time = $time - $time % $chunkDuration;
+
+for ($i = 0; $i &lt; $chunkCount; ++$i) {
+    $time += 6;
+    println(&quot;#EXT-X-PROGRAM-DATE-TIME:&quot; . gmdate(&quot;c&quot;, $time));
+    println(&quot;#EXTINF:&quot; . $chunkDuration . &quot;,&quot;);
+    println(&quot;../video-cookie-check-cookie.php&quot;);
+}
+?&gt;
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestshttptestsmediaresourcesvideocookiecheckcookiephp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/media/resources/video-cookie-check-cookie.php (173822 => 173823)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/media/resources/video-cookie-check-cookie.php        2014-09-22 09:37:47 UTC (rev 173822)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/media/resources/video-cookie-check-cookie.php        2014-09-22 09:42:55 UTC (rev 173823)
</span><span class="lines">@@ -1,14 +1,16 @@
</span><span class="cx"> &lt;?php
</span><span class="cx">     if($_COOKIE[&quot;TEST&quot;])
</span><span class="cx">     {
</span><del>-        $extension = substr($_COOKIE[&quot;TEST&quot;], -3);
-
</del><ins>+        $extension = pathinfo($_COOKIE[&quot;TEST&quot;], PATHINFO_EXTENSION);
</ins><span class="cx">         if ($extension == 'mp4') {
</span><span class="cx">                header(&quot;Content-Type: video/mp4&quot;);
</span><span class="cx">                $fileName = &quot;test.mp4&quot;;
</span><span class="cx">         } else if ($extension == 'ogv') {
</span><span class="cx">                header(&quot;Content-Type: video/ogg&quot;);
</span><span class="cx">                $fileName = &quot;test.ogv&quot;;
</span><ins>+        } else if ($extension == 'ts') {
+               header(&quot;Content-Type: video/mpegts&quot;);
+               $fileName = &quot;hls/test.ts&quot;;
</ins><span class="cx">         } else
</span><span class="cx">                die;
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/platform/gtk/TestExpectations (173822 => 173823)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/platform/gtk/TestExpectations        2014-09-22 09:37:47 UTC (rev 173822)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/platform/gtk/TestExpectations        2014-09-22 09:42:55 UTC (rev 173823)
</span><span class="lines">@@ -1028,6 +1028,8 @@
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/119264 transitions/created-while-suspended.html [ Pass Slow ]
</span><span class="cx"> 
</span><ins>+Bug(GTK) http/tests/media/hls/video-cookie.html [ Pass Slow ]
+
</ins><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # End of slow tests
</span><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/TestExpectations (173822 => 173823)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/TestExpectations        2014-09-22 09:37:47 UTC (rev 173822)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/TestExpectations        2014-09-22 09:42:55 UTC (rev 173823)
</span><span class="lines">@@ -1387,3 +1387,5 @@
</span><span class="cx"> webkit.org/b/135390 fast/css/fontloader-multiple-families.html [ Pass ]
</span><span class="cx"> webkit.org/b/135390 fast/css/fontloader-page-cache.html [ Pass ]
</span><span class="cx"> webkit.org/b/135390 http/tests/webfont/fontloader-loading-attribute.html [ Pass ]
</span><ins>+
+webkit.org/b/136994 http/tests/media/hls/video-cookie.html [ Failure ]
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (173822 => 173823)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog        2014-09-22 09:37:47 UTC (rev 173822)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog        2014-09-22 09:42:55 UTC (rev 173823)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-09-17  Philippe Normand  &lt;pnormand@igalia.com&gt;
+
+        [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-09-18  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK] Dot not allow to create delete-on-destroy GMainLoopSources
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (173822 => 173823)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp        2014-09-22 09:37:47 UTC (rev 173822)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp        2014-09-22 09:42:55 UTC (rev 173823)
</span><span class="lines">@@ -464,6 +464,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-&gt;player)
</span><span class="cx">         request.setHTTPReferrer(priv-&gt;player-&gt;referrer());
</span></span></pre>
</div>
</div>

</body>
</html>