<!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>[184690] trunk</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/184690">184690</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-20 19:09:14 -0700 (Wed, 20 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enable disk cache for range requests
https://bugs.webkit.org/show_bug.cgi?id=144682
Patch by Marcos Chavarría Teijeiro <mchavarria@igalia.com> on 2015-05-20
Reviewed by Antti Koivisto.
Source/WebKit2:
Add Range header value to the network cache key constructor so we take
into account this value. The 206 response code is also marked to be cached.
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::makeCacheKey):
(WebKit::NetworkCache::isStatusCodeCacheableByDefault):
* NetworkProcess/cache/NetworkCacheKey.cpp:
(WebKit::NetworkCache::Key::Key):
(WebKit::NetworkCache::Key::operator=):
(WebKit::NetworkCache::Key::computeHash):
(WebKit::NetworkCache::Key::operator==):
(WebKit::NetworkCache::Key::encode):
(WebKit::NetworkCache::Key::decode):
(WebKit::NetworkCache::Key::stringToHash): Deleted.
* NetworkProcess/cache/NetworkCacheKey.h:
LayoutTests:
* http/tests/cache/disk-cache/disk-cache-range-expected.txt: Added. Add Test.
* http/tests/cache/disk-cache/disk-cache-range.html: Added.
* http/tests/cache/disk-cache/resources/generate-response.cgi: Modify script to return 206 and 416 response codes if Range header is present.
* platform/gtk/TestExpectations: Remove failing test.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestscachediskcacheresourcesgenerateresponsecgi">trunk/LayoutTests/http/tests/cache/disk-cache/resources/generate-response.cgi</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheKeycpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheKeyh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestscachediskcachediskcacherangeexpectedtxt">trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-range-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscachediskcachediskcacherangehtml">trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-range.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (184689 => 184690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-21 01:37:58 UTC (rev 184689)
+++ trunk/LayoutTests/ChangeLog 2015-05-21 02:09:14 UTC (rev 184690)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-05-20 Marcos Chavarría Teijeiro <mchavarria@igalia.com>
+
+ Enable disk cache for range requests
+ https://bugs.webkit.org/show_bug.cgi?id=144682
+
+ Reviewed by Antti Koivisto.
+
+ * http/tests/cache/disk-cache/disk-cache-range-expected.txt: Added. Add Test.
+ * http/tests/cache/disk-cache/disk-cache-range.html: Added.
+ * http/tests/cache/disk-cache/resources/generate-response.cgi: Modify script to return 206 and 416 response codes if Range header is present.
+ * platform/gtk/TestExpectations: Remove failing test.
+
</ins><span class="cx"> 2015-05-20 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: improve list heuristics (presentational use versus actual lists)
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscachediskcachediskcacherangeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-range-expected.txt (0 => 184690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-range-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-range-expected.txt 2015-05-21 02:09:14 UTC (rev 184690)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+Test that request with different Range header values work.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+response headers: {"Cache-control":"max-age=100"}
+response source: Disk cache
+response status: 200
+
+response headers: {"Cache-control":"max-age=0"}
+response source: Network
+response status: 200
+
+response headers: {"Cache-control":"max-age=100","Range":"bytes=2-4"}
+response source: Disk cache
+response status: 206
+
+response headers: {"Cache-control":"max-age=0","Range":"bytes=2-4"}
+response source: Network
+response status: 206
+
+response headers: {"Cache-control":"max-age=100","Range":"bytes=5-7"}
+response source: Network
+response status: 416
+
+response headers: {"Cache-control":"max-age=0","Range":"bytes=5-7"}
+response source: Network
+response status: 416
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscachediskcachediskcacherangehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-range.html (0 => 184690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-range.html (rev 0)
+++ trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-range.html 2015-05-21 02:09:14 UTC (rev 184690)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+<script src="/js-test-resources/js-test-pre.js"></script>
+<script src="resources/cache-test.js"></script>
+<body>
+<script>
+
+ //Redefine printResults function to print also response status.
+function printResults(tests)
+{
+ for (var i = 0; i < tests.length; ++i) {
+ var test = tests[i];
+ debug("response headers: " + JSON.stringify(test.responseHeaders));
+ if (test.expiresInFutureIn304)
+ debug("response's 'Expires' header is overriden by future date in 304 response");
+ if (test.requestHeaders)
+ debug("request headers: " + JSON.stringify(test.requestHeaders));
+ responseSource = internals.xhrResponseSource(test.xhr);
+ debug("response source: " + responseSource);
+ debug("response status: " + test.xhr.status);
+ debug("");
+ }
+}
+
+
+var testMatrix =
+[
+ [
+ { responseHeaders: {'Cache-control': 'max-age=100' } },
+ { responseHeaders: {'Cache-control': 'max-age=0' } },
+ ],
+ [
+ { responseHeaders: {}},
+ { responseHeaders: {'Range': 'bytes=2-4' } },
+ { responseHeaders: {'Range': 'bytes=5-7' } },
+ ]
+];
+
+description("Test that request with different Range header values work.");
+
+var tests = generateTests(testMatrix);
+
+runTests(tests);
+
+</script>
+<script src="/js-test-resources/js-test-post.js"></script>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscachediskcacheresourcesgenerateresponsecgi"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/cache/disk-cache/resources/generate-response.cgi (184689 => 184690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/disk-cache/resources/generate-response.cgi 2015-05-21 01:37:58 UTC (rev 184689)
+++ trunk/LayoutTests/http/tests/cache/disk-cache/resources/generate-response.cgi 2015-05-21 02:09:14 UTC (rev 184690)
</span><span class="lines">@@ -19,6 +19,17 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+if ($query->http && $query->param("Range") =~ /bytes=(\d+)-(\d+)/) {
+
+ if ($1 < 6 && $2 < 6) {
+ print "Status: 206\n";
+ } else {
+ print "Status: 416\n";
+ }
+
+ $hasStatusCode = 1;
+}
+
</ins><span class="cx"> foreach (@names) {
</span><span class="cx"> next if ($_ eq "uniqueId");
</span><span class="cx"> next if ($_ eq "include-body");
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (184689 => 184690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2015-05-21 01:37:58 UTC (rev 184689)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2015-05-21 02:09:14 UTC (rev 184690)
</span><span class="lines">@@ -2292,8 +2292,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/144763 fast/events/scroll-in-scaled-page-with-overflow-hidden.html
</span><span class="cx">
</span><del>-webkit.org/b/144682 http/tests/xmlhttprequest/range-test.html [ Failure ]
-
</del><span class="cx"> webkit.org/b/141835 media/video-controls-no-scripting.html [ Failure ]
</span><span class="cx"> webkit.org/b/145048 http/tests/misc/bad-charset-alias.html [ Failure ]
</span><span class="cx"> webkit.org/b/145049 fast/text/simple-line-layout-text-stroke-width.html [ Failure ]
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (184689 => 184690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-21 01:37:58 UTC (rev 184689)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-21 02:09:14 UTC (rev 184690)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-05-20 Marcos Chavarría Teijeiro <mchavarria@igalia.com>
+
+ Enable disk cache for range requests
+ https://bugs.webkit.org/show_bug.cgi?id=144682
+
+ Reviewed by Antti Koivisto.
+
+ Add Range header value to the network cache key constructor so we take
+ into account this value. The 206 response code is also marked to be cached.
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::makeCacheKey):
+ (WebKit::NetworkCache::isStatusCodeCacheableByDefault):
+ * NetworkProcess/cache/NetworkCacheKey.cpp:
+ (WebKit::NetworkCache::Key::Key):
+ (WebKit::NetworkCache::Key::operator=):
+ (WebKit::NetworkCache::Key::computeHash):
+ (WebKit::NetworkCache::Key::operator==):
+ (WebKit::NetworkCache::Key::encode):
+ (WebKit::NetworkCache::Key::decode):
+ (WebKit::NetworkCache::Key::stringToHash): Deleted.
+ * NetworkProcess/cache/NetworkCacheKey.h:
+
</ins><span class="cx"> 2015-05-20 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> WKWebsiteDataStore API doesn't report webkit.org as using Databases or App Cache after visiting http://www.webkit.org/demos/sticky-notes/
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (184689 => 184690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-05-21 01:37:58 UTC (rev 184689)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-05-21 02:09:14 UTC (rev 184690)
</span><span class="lines">@@ -109,7 +109,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> if (partition.isEmpty())
</span><span class="cx"> partition = ASCIILiteral("No partition");
</span><del>- return { request.httpMethod(), partition, request.url().string() };
</del><ins>+
+ // FIXME: This implements minimal Range header disk cache support. We don't parse
+ // ranges so only the same exact range request will be served from the cache.
+ String range = request.httpHeaderField(WebCore::HTTPHeaderName::Range);
+ return { request.httpMethod(), partition, range, request.url().string() };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static String headerValueForVary(const WebCore::ResourceRequest& request, const String& headerName)
</span><span class="lines">@@ -237,6 +241,7 @@
</span><span class="cx"> case 200: // OK
</span><span class="cx"> case 203: // Non-Authoritative Information
</span><span class="cx"> case 204: // No Content
</span><ins>+ case 206: // Partial Content
</ins><span class="cx"> case 300: // Multiple Choices
</span><span class="cx"> case 301: // Moved Permanently
</span><span class="cx"> case 404: // Not Found
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheKeycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp (184689 => 184690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp 2015-05-21 01:37:58 UTC (rev 184689)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp 2015-05-21 02:09:14 UTC (rev 184690)
</span><span class="lines">@@ -40,14 +40,16 @@
</span><span class="cx"> : m_method(o.m_method.isolatedCopy())
</span><span class="cx"> , m_partition(o.m_partition.isolatedCopy())
</span><span class="cx"> , m_identifier(o.m_identifier.isolatedCopy())
</span><ins>+ , m_range(o.m_range.isolatedCopy())
</ins><span class="cx"> , m_hash(o.m_hash)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Key::Key(const String& method, const String& partition, const String& identifier)
</del><ins>+Key::Key(const String& method, const String& partition, const String& range, const String& identifier)
</ins><span class="cx"> : m_method(method.isolatedCopy())
</span><span class="cx"> , m_partition(partition.isolatedCopy())
</span><span class="cx"> , m_identifier(identifier.isolatedCopy())
</span><ins>+ , m_range(range.isolatedCopy())
</ins><span class="cx"> , m_hash(computeHash())
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -57,6 +59,7 @@
</span><span class="cx"> m_method = other.m_method.isolatedCopy();
</span><span class="cx"> m_partition = other.m_partition.isolatedCopy();
</span><span class="cx"> m_identifier = other.m_identifier.isolatedCopy();
</span><ins>+ m_range = other.m_range.isolatedCopy();
</ins><span class="cx"> m_hash = other.m_hash;
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="lines">@@ -64,6 +67,10 @@
</span><span class="cx"> static void hashString(MD5& md5, const String& string)
</span><span class="cx"> {
</span><span class="cx"> const uint8_t zero = 0;
</span><ins>+
+ if (string.isNull())
+ return;
+
</ins><span class="cx"> if (string.is8Bit() && string.containsOnlyASCII()) {
</span><span class="cx"> md5.addBytes(string.characters8(), string.length());
</span><span class="cx"> md5.addBytes(&zero, 1);
</span><span class="lines">@@ -82,6 +89,7 @@
</span><span class="cx"> hashString(md5, m_method);
</span><span class="cx"> hashString(md5, m_partition);
</span><span class="cx"> hashString(md5, m_identifier);
</span><ins>+ hashString(md5, m_range);
</ins><span class="cx"> MD5::Digest hash;
</span><span class="cx"> md5.checksum(hash);
</span><span class="cx"> return hash;
</span><span class="lines">@@ -121,7 +129,7 @@
</span><span class="cx">
</span><span class="cx"> bool Key::operator==(const Key& other) const
</span><span class="cx"> {
</span><del>- return m_hash == other.m_hash && m_method == other.m_method && m_partition == other.m_partition && m_identifier == other.m_identifier;
</del><ins>+ return m_hash == other.m_hash && m_method == other.m_method && m_partition == other.m_partition && m_identifier == other.m_identifier && m_range == other.m_range;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Key::encode(Encoder& encoder) const
</span><span class="lines">@@ -129,12 +137,13 @@
</span><span class="cx"> encoder << m_method;
</span><span class="cx"> encoder << m_partition;
</span><span class="cx"> encoder << m_identifier;
</span><ins>+ encoder << m_range;
</ins><span class="cx"> encoder << m_hash;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Key::decode(Decoder& decoder, Key& key)
</span><span class="cx"> {
</span><del>- return decoder.decode(key.m_method) && decoder.decode(key.m_partition) && decoder.decode(key.m_identifier) && decoder.decode(key.m_hash);
</del><ins>+ return decoder.decode(key.m_method) && decoder.decode(key.m_partition) && decoder.decode(key.m_identifier) && decoder.decode(key.m_range) && decoder.decode(key.m_hash);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheKeyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h (184689 => 184690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h 2015-05-21 01:37:58 UTC (rev 184689)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h 2015-05-21 02:09:14 UTC (rev 184690)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> Key() { }
</span><span class="cx"> Key(const Key&);
</span><span class="cx"> Key(Key&&) = default;
</span><del>- Key(const String& method, const String& partition, const String& identifier);
</del><ins>+ Key(const String& method, const String& partition, const String& range, const String& identifier);
</ins><span class="cx">
</span><span class="cx"> Key& operator=(const Key&);
</span><span class="cx"> Key& operator=(Key&&) = default;
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> String m_method;
</span><span class="cx"> String m_partition;
</span><span class="cx"> String m_identifier;
</span><ins>+ String m_range;
</ins><span class="cx"> HashType m_hash;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>