<!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>[169976] trunk/Source/WebCore</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/169976">169976</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-06-14 12:13:46 -0700 (Sat, 14 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Generate HTTP header names that are required by WebKitWebSrc
https://bugs.webkit.org/show_bug.cgi?id=133906
Reviewed by Anders Carlsson.
WebKitWebSrc implementation sets icy-metadata and transferMode.dlna HTTP headers
on ResourceRequest objects. The two headers are added to HTTPHeaderNames.in, and
a small tweak is added to the generator script to avoid the dot in the second
header's name (which would otherwise generate invalid C++).
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(webKitWebSrcStart):
* platform/network/HTTPHeaderNames.in:
* platform/network/create-http-header-name-table:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPHeaderNamesin">trunk/Source/WebCore/platform/network/HTTPHeaderNames.in</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcreatehttpheadernametable">trunk/Source/WebCore/platform/network/create-http-header-name-table</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169975 => 169976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-06-14 19:10:39 UTC (rev 169975)
+++ trunk/Source/WebCore/ChangeLog        2014-06-14 19:13:46 UTC (rev 169976)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-06-14 Zan Dobersek <zdobersek@igalia.com>
+
+ Generate HTTP header names that are required by WebKitWebSrc
+ https://bugs.webkit.org/show_bug.cgi?id=133906
+
+ Reviewed by Anders Carlsson.
+
+ WebKitWebSrc implementation sets icy-metadata and transferMode.dlna HTTP headers
+ on ResourceRequest objects. The two headers are added to HTTPHeaderNames.in, and
+ a small tweak is added to the generator script to avoid the dot in the second
+ header's name (which would otherwise generate invalid C++).
+
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+ (webKitWebSrcStart):
+ * platform/network/HTTPHeaderNames.in:
+ * platform/network/create-http-header-name-table:
+
</ins><span class="cx"> 2014-06-14 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Replace some uses of ResourceRequestBase::addHTTPHeaderField with setHTTPHeaderField
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (169975 => 169976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp        2014-06-14 19:10:39 UTC (rev 169975)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp        2014-06-14 19:13:46 UTC (rev 169976)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "CrossOriginAccessControl.h"
</span><span class="cx"> #include "GRefPtrGStreamer.h"
</span><span class="cx"> #include "GStreamerUtilities.h"
</span><ins>+#include "HTTPHeaderNames.h"
</ins><span class="cx"> #include "MediaPlayer.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include "ResourceHandle.h"
</span><span class="lines">@@ -484,15 +485,15 @@
</span><span class="cx">
</span><span class="cx"> if (priv->requestedOffset) {
</span><span class="cx"> GUniquePtr<gchar> val(g_strdup_printf("bytes=%" G_GUINT64_FORMAT "-", priv->requestedOffset));
</span><del>- request.setHTTPHeaderField("Range", val.get());
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::Range, val.get());
</ins><span class="cx"> }
</span><span class="cx"> priv->offset = priv->requestedOffset;
</span><span class="cx">
</span><span class="cx"> // We always request Icecast/Shoutcast metadata, just in case ...
</span><del>- request.setHTTPHeaderField("icy-metadata", "1");
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::IcyMetadata, "1");
</ins><span class="cx">
</span><span class="cx"> // Needed to use DLNA streaming servers
</span><del>- request.setHTTPHeaderField("transferMode.dlna", "Streaming");
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::TransferModeDLNA, "Streaming");
</ins><span class="cx">
</span><span class="cx"> if (priv->player) {
</span><span class="cx"> if (CachedResourceLoader* loader = priv->player->cachedResourceLoader())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPHeaderNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPHeaderNames.in (169975 => 169976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderNames.in        2014-06-14 19:10:39 UTC (rev 169975)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderNames.in        2014-06-14 19:13:46 UTC (rev 169976)
</span><span class="lines">@@ -57,3 +57,7 @@
</span><span class="cx"> Upgrade
</span><span class="cx"> User-Agent
</span><span class="cx"> X-Frame-Options
</span><ins>+
+// These headers are specific to GStreamer.
+Icy-Metadata
+TransferMode.DLNA
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcreatehttpheadernametable"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/create-http-header-name-table (169975 => 169976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/create-http-header-name-table        2014-06-14 19:10:39 UTC (rev 169975)
+++ trunk/Source/WebCore/platform/network/create-http-header-name-table        2014-06-14 19:13:46 UTC (rev 169976)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> if not http_header_name or http_header_name[:2] == '//':
</span><span class="cx"> continue
</span><span class="cx">
</span><del>- http_header_name_to_id[http_header_name] = http_header_name.replace('-', '')
</del><ins>+ http_header_name_to_id[http_header_name] = http_header_name.replace('-', '').replace('.', '')
</ins><span class="cx">
</span><span class="cx"> http_header_names.append(http_header_name)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>