<!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>[170132] 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/170132">170132</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2014-06-18 17:06:09 -0700 (Wed, 18 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[curl] Unreviewed speculative build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/170021">r170021</a>.
* platform/network/curl/CurlCacheEntry.cpp:
(WebCore::CurlCacheEntry::setResponseFromCachedHeaders):
(WebCore::CurlCacheEntry::parseResponseHeaders):
* platform/network/curl/CurlDownload.cpp:
(WebCore::CurlDownload::didReceiveHeader):
* platform/network/curl/ResourceHandleManager.cpp:
(WebCore::getProtectionSpace):
(WebCore::headerCallback):
Use HTTPHeaderName constants.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlCurlCacheEntrycpp">trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlCurlDownloadcpp">trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlResourceHandleManagercpp">trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170131 => 170132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-18 23:49:26 UTC (rev 170131)
+++ trunk/Source/WebCore/ChangeLog 2014-06-19 00:06:09 UTC (rev 170132)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-06-18 Alex Christensen <achristensen@webkit.org>
+
+ [curl] Unreviewed speculative build fix after r170021.
+
+ * platform/network/curl/CurlCacheEntry.cpp:
+ (WebCore::CurlCacheEntry::setResponseFromCachedHeaders):
+ (WebCore::CurlCacheEntry::parseResponseHeaders):
+ * platform/network/curl/CurlDownload.cpp:
+ (WebCore::CurlDownload::didReceiveHeader):
+ * platform/network/curl/ResourceHandleManager.cpp:
+ (WebCore::getProtectionSpace):
+ (WebCore::headerCallback):
+ Use HTTPHeaderName constants.
+
</ins><span class="cx"> 2014-06-18 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Move the removeNode() tree walking from ScrollingStateNote into ScrollingStateTree
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlCurlCacheEntrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.cpp (170131 => 170132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.cpp 2014-06-18 23:49:26 UTC (rev 170131)
+++ trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.cpp 2014-06-19 00:06:09 UTC (rev 170132)
</span><span class="lines">@@ -184,17 +184,17 @@
</span><span class="cx">
</span><span class="cx"> // Try to parse expected content length
</span><span class="cx"> long long contentLength = -1;
</span><del>- if (!response.httpHeaderField("Content-Length").isNull()) {
</del><ins>+ if (!response.httpHeaderField(HTTPHeaderName::ContentLength).isNull()) {
</ins><span class="cx"> bool success = false;
</span><del>- long long parsedContentLength = response.httpHeaderField("Content-Length").toInt64(&success);
</del><ins>+ long long parsedContentLength = response.httpHeaderField(HTTPHeaderName::ContentLength).toInt64(&success);
</ins><span class="cx"> if (success)
</span><span class="cx"> contentLength = parsedContentLength;
</span><span class="cx"> }
</span><span class="cx"> response.setExpectedContentLength(contentLength); // -1 on parse error or null
</span><span class="cx">
</span><del>- response.setMimeType(extractMIMETypeFromMediaType(response.httpHeaderField("Content-Type")));
- response.setTextEncodingName(extractCharsetFromMediaType(response.httpHeaderField("Content-Type")));
- response.setSuggestedFilename(filenameFromHTTPContentDisposition(response.httpHeaderField("Content-Disposition")));
</del><ins>+ response.setMimeType(extractMIMETypeFromMediaType(response.httpHeaderField(HTTPHeaderName::ContentType)));
+ response.setTextEncodingName(extractCharsetFromMediaType(response.httpHeaderField(HTTPHeaderName::ContentType)));
+ response.setSuggestedFilename(filenameFromHTTPContentDisposition(response.httpHeaderField(HTTPHeaderName::ContentDisposition)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CurlCacheEntry::didFail()
</span><span class="lines">@@ -332,11 +332,11 @@
</span><span class="cx"> m_expireDate = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- String etag = response.httpHeaderField("ETag");
</del><ins>+ String etag = response.httpHeaderField(HTTPHeaderName::ETag);
</ins><span class="cx"> if (!etag.isNull())
</span><span class="cx"> m_requestHeaders.set(HTTPHeaderName::IfNoneMatch, etag);
</span><span class="cx">
</span><del>- String lastModified = response.httpHeaderField("Last-Modified");
</del><ins>+ String lastModified = response.httpHeaderField(HTTPHeaderName::LastModified);
</ins><span class="cx"> if (!lastModified.isNull())
</span><span class="cx"> m_requestHeaders.set(HTTPHeaderName::IfModifiedSince, lastModified);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlCurlDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp (170131 => 170132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp 2014-06-18 23:49:26 UTC (rev 170131)
+++ trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp 2014-06-19 00:06:09 UTC (rev 170132)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CurlDownload.h"
</span><span class="cx">
</span><ins>+#include "HTTPHeaderNames.h"
</ins><span class="cx"> #include "HTTPParsers.h"
</span><span class="cx"> #include "MainThreadTask.h"
</span><span class="cx"> #include "ResourceHandleManager.h"
</span><span class="lines">@@ -396,9 +397,9 @@
</span><span class="cx"> err = curl_easy_getinfo(m_curlHandle, CURLINFO_EFFECTIVE_URL, &url);
</span><span class="cx"> m_response.setURL(URL(ParsedURLString, url));
</span><span class="cx">
</span><del>- m_response.setMimeType(extractMIMETypeFromMediaType(m_response.httpHeaderField("Content-Type")));
- m_response.setTextEncodingName(extractCharsetFromMediaType(m_response.httpHeaderField("Content-Type")));
- m_response.setSuggestedFilename(filenameFromHTTPContentDisposition(m_response.httpHeaderField("Content-Disposition")));
</del><ins>+ m_response.setMimeType(extractMIMETypeFromMediaType(m_response.httpHeaderField(HTTPHeaderName::ContentType)));
+ m_response.setTextEncodingName(extractCharsetFromMediaType(m_response.httpHeaderField(HTTPHeaderName::ContentType)));
+ m_response.setSuggestedFilename(filenameFromHTTPContentDisposition(m_response.httpHeaderField(HTTPHeaderName::ContentDisposition)));
</ins><span class="cx">
</span><span class="cx"> callOnMainThread(MainThreadTask(receivedResponseCallback, this));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlResourceHandleManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp (170131 => 170132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2014-06-18 23:49:26 UTC (rev 170131)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2014-06-19 00:06:09 UTC (rev 170132)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #include "CredentialStorage.h"
</span><span class="cx"> #include "CurlCacheManager.h"
</span><span class="cx"> #include "DataURL.h"
</span><ins>+#include "HTTPHeaderNames.h"
</ins><span class="cx"> #include "HTTPParsers.h"
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><span class="cx"> #include "MultipartHandle.h"
</span><span class="lines">@@ -407,7 +408,7 @@
</span><span class="cx">
</span><span class="cx"> String realm;
</span><span class="cx">
</span><del>- const String authHeader = response.httpHeaderField("WWW-Authenticate");
</del><ins>+ const String authHeader = response.httpHeaderField(HTTPHeaderName::WWWAuthenticate);
</ins><span class="cx"> const String realmString = "realm=";
</span><span class="cx"> int realmPos = authHeader.find(realmString);
</span><span class="cx"> if (realmPos > 0) {
</span><span class="lines">@@ -488,13 +489,13 @@
</span><span class="cx"> d->m_response.setURL(URL(ParsedURLString, hdr));
</span><span class="cx">
</span><span class="cx"> d->m_response.setHTTPStatusCode(httpCode);
</span><del>- d->m_response.setMimeType(extractMIMETypeFromMediaType(d->m_response.httpHeaderField("Content-Type")).lower());
- d->m_response.setTextEncodingName(extractCharsetFromMediaType(d->m_response.httpHeaderField("Content-Type")));
- d->m_response.setSuggestedFilename(filenameFromHTTPContentDisposition(d->m_response.httpHeaderField("Content-Disposition")));
</del><ins>+ d->m_response.setMimeType(extractMIMETypeFromMediaType(d->m_response.httpHeaderField(HTTPHeaderName::ContentType)).lower());
+ d->m_response.setTextEncodingName(extractCharsetFromMediaType(d->m_response.httpHeaderField(HTTPHeaderName::ContentType)));
+ d->m_response.setSuggestedFilename(filenameFromHTTPContentDisposition(d->m_response.httpHeaderField(HTTPHeaderName::ContentDisposition)));
</ins><span class="cx">
</span><span class="cx"> if (d->m_response.isMultipart()) {
</span><span class="cx"> String boundary;
</span><del>- bool parsed = MultipartHandle::extractBoundary(d->m_response.httpHeaderField("Content-Type"), boundary);
</del><ins>+ bool parsed = MultipartHandle::extractBoundary(d->m_response.httpHeaderField(HTTPHeaderName::ContentType), boundary);
</ins><span class="cx"> if (parsed)
</span><span class="cx"> d->m_multipartHandle = MultipartHandle::create(job, boundary);
</span><span class="cx"> }
</span><span class="lines">@@ -506,7 +507,7 @@
</span><span class="cx">
</span><span class="cx"> // HTTP redirection
</span><span class="cx"> if (isHttpRedirect(httpCode)) {
</span><del>- String location = d->m_response.httpHeaderField("location");
</del><ins>+ String location = d->m_response.httpHeaderField(HTTPHeaderName::Location);
</ins><span class="cx"> if (!location.isEmpty()) {
</span><span class="cx"> URL newURL = URL(job->firstRequest().url(), location);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>