<!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>[179011] trunk/LayoutTests</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/179011">179011</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-01-23 10:28:05 -0800 (Fri, 23 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Create a "load and stall" cgi that support byte ranges.
https://bugs.webkit.org/show_bug.cgi?id=140628
Reviewed by Jer Noble.
* http/tests/media/resources/serve-video.php: Add support for "stallOffset", "stallDuration",
and "chunkSize" parameters.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsmediaresourcesservevideophp">trunk/LayoutTests/http/tests/media/resources/serve-video.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (179010 => 179011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-01-23 18:27:27 UTC (rev 179010)
+++ trunk/LayoutTests/ChangeLog        2015-01-23 18:28:05 UTC (rev 179011)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-01-23 Eric Carlson <eric.carlson@apple.com>
+
+ Create a "load and stall" cgi that support byte ranges.
+ https://bugs.webkit.org/show_bug.cgi?id=140628
+
+ Reviewed by Jer Noble.
+
+ * http/tests/media/resources/serve-video.php: Add support for "stallOffset", "stallDuration",
+ and "chunkSize" parameters.
+
</ins><span class="cx"> 2015-01-23 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> svg-resource-fragment-identifier-img-src.html is a hidpi reftest, but its -expected.html
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediaresourcesservevideophp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/media/resources/serve-video.php (179010 => 179011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/resources/serve-video.php        2015-01-23 18:27:27 UTC (rev 179010)
+++ trunk/LayoutTests/http/tests/media/resources/serve-video.php        2015-01-23 18:28:05 UTC (rev 179011)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx">
</span><span class="cx"> // Set variables
</span><span class="cx"> $settings = array(
</span><del>- "chunkSize" => 1024 * 256,
</del><ins>+ "chunkSize" => array_key_exists("chunkSize", $_GET) ? $_GET["chunkSize"] : 1024 * 256,
</ins><span class="cx"> "databaseFile" => "metadata.db",
</span><span class="cx"> "httpStatus" => "500 Internal Server Error",
</span><span class="cx"> "mediaDirectory" => array_key_exists("name", $_GET) ? dirname($_GET["name"]) : "",
</span><span class="lines">@@ -18,6 +18,8 @@
</span><span class="cx"> "setContentLength" => array_key_exists("content-length", $_GET) ? $_GET["content-length"] : "yes",
</span><span class="cx"> "setIcyData" => array_key_exists("icy-data", $_GET) ? $_GET["icy-data"] : "no",
</span><span class="cx"> "supportRanges" => array_key_exists("ranges", $_GET) ? $_GET["ranges"] : "yes",
</span><ins>+ "stallOffset" => array_key_exists("stallOffset", $_GET) ? $_GET["stallOffset"] : 0,
+ "stallDuration" => array_key_exists("stallDuration", $_GET) ? $_GET["stallDuration"] : 2,
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // 500 on errors
</span><span class="lines">@@ -25,10 +27,10 @@
</span><span class="cx"> trigger_error("You have not specified a 'name' parameter.", E_USER_WARNING);
</span><span class="cx"> goto answering;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> $fileName = $_GET["name"];
</span><del>-
</del><span class="cx"> if (!file_exists($fileName)) {
</span><del>- trigger_error("The file to stream specified at 'name' doesn't exist.", E_USER_WARNING);
</del><ins>+ trigger_error("The file '" . $fileName . "' doesn't exist.", E_USER_WARNING);
</ins><span class="cx"> goto answering;
</span><span class="cx"> }
</span><span class="cx"> $settings["databaseFile"] = $settings["mediaDirectory"] . "/" . $settings["databaseFile"];
</span><span class="lines">@@ -67,6 +69,11 @@
</span><span class="cx">
</span><span class="cx"> // There is everything needed to send the media file
</span><span class="cx"> $fileSize = filesize($fileName);
</span><ins>+ if ($settings["stallOffset"] && ($settings["stallOffset"] > $fileSize)) {
+ trigger_error("The 'stallOffset' offset parameter is greater than file size (" . $fileSize . ").", E_USER_WARNING);
+ goto answering;
+ }
+
</ins><span class="cx"> $start = 0;
</span><span class="cx"> $end = $fileSize - 1;
</span><span class="cx"> if ($settings["supportRanges"] != "no" && array_key_exists("HTTP_RANGE", $_SERVER))
</span><span class="lines">@@ -107,7 +114,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
</span><del>- header("Pragma: no-cache");
</del><ins>+ header("Cache-Control: no-cache");
</ins><span class="cx"> header("Etag: " . '"' . $fileSize . "-" . filemtime($fileName) . '"');
</span><span class="cx"> if ($settings["setIcyData"] == "yes") {
</span><span class="cx"> $bitRate = ceil($playFiles[$i]["bitRate"] / 1000);
</span><span class="lines">@@ -134,12 +141,24 @@
</span><span class="cx"> $fn = fopen($fileName, "rb");
</span><span class="cx"> fseek($fn, $offset, 0);
</span><span class="cx">
</span><ins>+ if ($settings["stallDuration"])
+ set_time_limit(0);
+
</ins><span class="cx"> while (!feof($fn) && $offset <= $end && connection_status() == 0) {
</span><span class="cx"> $readSize = min($settings["chunkSize"], ($end - $offset) + 1);
</span><ins>+ $stallNow = false;
+ if ($settings["stallOffset"] && $settings["stallOffset"] >= $offset && $settings["stallOffset"] < $offset + $readSize) {
+ $readSize = min($settings["chunkSize"], $settings["stallOffset"] - $offset);
+ $stallNow = true;
+ }
+
</ins><span class="cx"> $buffer = fread($fn, $readSize);
</span><span class="cx"> print($buffer);
</span><span class="cx"> flush();
</span><span class="cx"> $offset += $settings["chunkSize"];
</span><ins>+
+ if ($stallNow)
+ sleep($settings["stallDuration"]);
</ins><span class="cx"> }
</span><span class="cx"> fclose($fn);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>