<!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>[210785] trunk/Source</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/210785">210785</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-16 03:24:23 -0800 (Mon, 16 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[SOUP] Fix handling of accept language property
https://bugs.webkit.org/show_bug.cgi?id=166969
Reviewed by Michael Catanzaro.
Source/WebCore:
Add SoupNetworkSession::setInitialAcceptLanguages() static method and update setAcceptLanguages to receive the
string already built from the languages vector. Now the SoupNetworkSession saves that value globally that
is always used when creating new sessions.
* platform/network/soup/NetworkStorageSessionSoup.cpp:
(WebCore::NetworkStorageSession::switchToNewTestingSession): Remove workaround.
* platform/network/soup/SoupNetworkSession.cpp:
(WebCore::SoupNetworkSession::SoupNetworkSession): If initial accept languages were set, apply them to the newly created context.
(WebCore::SoupNetworkSession::setInitialAcceptLanguages): Just save the given value globally.
(WebCore::SoupNetworkSession::setAcceptLanguages): It receives now the string, so just set it to the session.
* platform/network/soup/SoupNetworkSession.h:
Source/WebKit2:
* NetworkProcess/soup/NetworkProcessSoup.cpp:
(WebKit::buildAcceptLanguages): Moved from WebCore.
(WebKit::NetworkProcess::userPreferredLanguagesChanged): Build the accept language string from the vector and
pass set it to SoupNetworkSession to be used for new sessions, and also to all other existing sessions.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupNetworkStorageSessionSoupcpp">trunk/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSoupNetworkSessioncpp">trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSoupNetworkSessionh">trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesssoupNetworkProcessSoupcpp">trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210784 => 210785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-16 00:14:40 UTC (rev 210784)
+++ trunk/Source/WebCore/ChangeLog 2017-01-16 11:24:23 UTC (rev 210785)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-01-16 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] Fix handling of accept language property
+ https://bugs.webkit.org/show_bug.cgi?id=166969
+
+ Reviewed by Michael Catanzaro.
+
+ Add SoupNetworkSession::setInitialAcceptLanguages() static method and update setAcceptLanguages to receive the
+ string already built from the languages vector. Now the SoupNetworkSession saves that value globally that
+ is always used when creating new sessions.
+
+ * platform/network/soup/NetworkStorageSessionSoup.cpp:
+ (WebCore::NetworkStorageSession::switchToNewTestingSession): Remove workaround.
+ * platform/network/soup/SoupNetworkSession.cpp:
+ (WebCore::SoupNetworkSession::SoupNetworkSession): If initial accept languages were set, apply them to the newly created context.
+ (WebCore::SoupNetworkSession::setInitialAcceptLanguages): Just save the given value globally.
+ (WebCore::SoupNetworkSession::setAcceptLanguages): It receives now the string, so just set it to the session.
+ * platform/network/soup/SoupNetworkSession.h:
+
</ins><span class="cx"> 2017-01-15 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] SoupNetworkSession constructor should be explicit
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupNetworkStorageSessionSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp (210784 => 210785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp 2017-01-16 00:14:40 UTC (rev 210784)
+++ trunk/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp 2017-01-16 11:24:23 UTC (rev 210785)
</span><span class="lines">@@ -84,8 +84,6 @@
</span><span class="cx"> void NetworkStorageSession::switchToNewTestingSession()
</span><span class="cx"> {
</span><span class="cx"> defaultSession() = std::make_unique<NetworkStorageSession>(SessionID::defaultSessionID(), std::make_unique<SoupNetworkSession>());
</span><del>- // FIXME: Creating a testing session is losing soup session values set when initializing the network process.
- g_object_set(defaultSession()->soupNetworkSession().soupSession(), "accept-language", "en-us", nullptr);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SoupNetworkSession& NetworkStorageSession::soupNetworkSession() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSoupNetworkSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp (210784 => 210785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2017-01-16 00:14:40 UTC (rev 210784)
+++ trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2017-01-16 11:24:23 UTC (rev 210785)
</span><span class="lines">@@ -41,11 +41,11 @@
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/text/Base64.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><del>-#include <wtf/text/StringBuilder.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> static bool gIgnoreTLSErrors;
</span><ins>+static CString gInitialAcceptLanguages;
</ins><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> inline static void soupLogPrinter(SoupLogger*, SoupLoggerLogLevel, char direction, const char* data, gpointer)
</span><span class="lines">@@ -138,6 +138,9 @@
</span><span class="cx"> SOUP_SESSION_SSL_STRICT, FALSE,
</span><span class="cx"> nullptr);
</span><span class="cx">
</span><ins>+ if (!gInitialAcceptLanguages.isNull())
+ setAcceptLanguages(gInitialAcceptLanguages);
+
</ins><span class="cx"> #if SOUP_CHECK_VERSION(2, 53, 92)
</span><span class="cx"> if (soup_auth_negotiate_supported()) {
</span><span class="cx"> g_object_set(m_soupSession.get(),
</span><span class="lines">@@ -247,53 +250,15 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static CString buildAcceptLanguages(const Vector<String>& languages)
</del><ins>+
+void SoupNetworkSession::setInitialAcceptLanguages(const CString& languages)
</ins><span class="cx"> {
</span><del>- size_t languagesCount = languages.size();
-
- // Ignore "C" locale.
- size_t cLocalePosition = languages.find("c");
- if (cLocalePosition != notFound)
- languagesCount--;
-
- // Fallback to "en" if the list is empty.
- if (!languagesCount)
- return "en";
-
- // Calculate deltas for the quality values.
- int delta;
- if (languagesCount < 10)
- delta = 10;
- else if (languagesCount < 20)
- delta = 5;
- else
- delta = 1;
-
- // Set quality values for each language.
- StringBuilder builder;
- for (size_t i = 0; i < languages.size(); ++i) {
- if (i == cLocalePosition)
- continue;
-
- if (i)
- builder.appendLiteral(", ");
-
- builder.append(languages[i]);
-
- int quality = 100 - i * delta;
- if (quality > 0 && quality < 100) {
- char buffer[8];
- g_ascii_formatd(buffer, 8, "%.2f", quality / 100.0);
- builder.append(String::format(";q=%s", buffer));
- }
- }
-
- return builder.toString().utf8();
</del><ins>+ gInitialAcceptLanguages = languages;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void SoupNetworkSession::setAcceptLanguages(const Vector<String>& languages)
</del><ins>+void SoupNetworkSession::setAcceptLanguages(const CString& languages)
</ins><span class="cx"> {
</span><del>- g_object_set(m_soupSession.get(), "accept-language", buildAcceptLanguages(languages).data(), nullptr);
</del><ins>+ g_object_set(m_soupSession.get(), "accept-language", languages.data(), nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SoupNetworkSession::setShouldIgnoreTLSErrors(bool ignoreTLSErrors)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSoupNetworkSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h (210784 => 210785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h 2017-01-16 00:14:40 UTC (rev 210784)
+++ trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h 2017-01-16 11:24:23 UTC (rev 210785)
</span><span class="lines">@@ -58,7 +58,8 @@
</span><span class="cx">
</span><span class="cx"> void setupHTTPProxyFromEnvironment();
</span><span class="cx">
</span><del>- void setAcceptLanguages(const Vector<String>&);
</del><ins>+ static void setInitialAcceptLanguages(const CString&);
+ void setAcceptLanguages(const CString&);
</ins><span class="cx">
</span><span class="cx"> static void setShouldIgnoreTLSErrors(bool);
</span><span class="cx"> static void checkTLSErrors(SoupRequest*, SoupMessage*, std::function<void (const ResourceError&)>&&);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (210784 => 210785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-16 00:14:40 UTC (rev 210784)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-16 11:24:23 UTC (rev 210785)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-01-16 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] Fix handling of accept language property
+ https://bugs.webkit.org/show_bug.cgi?id=166969
+
+ Reviewed by Michael Catanzaro.
+
+ * NetworkProcess/soup/NetworkProcessSoup.cpp:
+ (WebKit::buildAcceptLanguages): Moved from WebCore.
+ (WebKit::NetworkProcess::userPreferredLanguagesChanged): Build the accept language string from the vector and
+ pass set it to SoupNetworkSession to be used for new sessions, and also to all other existing sessions.
+
</ins><span class="cx"> 2017-01-14 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused WKView initializer parameter
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesssoupNetworkProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp (210784 => 210785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2017-01-16 00:14:40 UTC (rev 210784)
+++ trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2017-01-16 11:24:23 UTC (rev 210785)
</span><span class="lines">@@ -41,14 +41,64 @@
</span><span class="cx"> #include <wtf/RAMSize.h>
</span><span class="cx"> #include <wtf/glib/GRefPtr.h>
</span><span class="cx"> #include <wtf/glib/GUniquePtr.h>
</span><ins>+#include <wtf/text/CString.h>
+#include <wtf/text/StringBuilder.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+static CString buildAcceptLanguages(const Vector<String>& languages)
+{
+ size_t languagesCount = languages.size();
+
+ // Ignore "C" locale.
+ size_t cLocalePosition = languages.find("c");
+ if (cLocalePosition != notFound)
+ languagesCount--;
+
+ // Fallback to "en" if the list is empty.
+ if (!languagesCount)
+ return "en";
+
+ // Calculate deltas for the quality values.
+ int delta;
+ if (languagesCount < 10)
+ delta = 10;
+ else if (languagesCount < 20)
+ delta = 5;
+ else
+ delta = 1;
+
+ // Set quality values for each language.
+ StringBuilder builder;
+ for (size_t i = 0; i < languages.size(); ++i) {
+ if (i == cLocalePosition)
+ continue;
+
+ if (i)
+ builder.appendLiteral(", ");
+
+ builder.append(languages[i]);
+
+ int quality = 100 - i * delta;
+ if (quality > 0 && quality < 100) {
+ char buffer[8];
+ g_ascii_formatd(buffer, 8, "%.2f", quality / 100.0);
+ builder.append(String::format(";q=%s", buffer));
+ }
+ }
+
+ return builder.toString().utf8();
+}
+
</ins><span class="cx"> void NetworkProcess::userPreferredLanguagesChanged(const Vector<String>& languages)
</span><span class="cx"> {
</span><del>- NetworkStorageSession::defaultStorageSession().soupNetworkSession().setAcceptLanguages(languages);
</del><ins>+ auto acceptLanguages = buildAcceptLanguages(languages);
+ SoupNetworkSession::setInitialAcceptLanguages(acceptLanguages);
+ NetworkStorageSession::forEach([&acceptLanguages](const WebCore::NetworkStorageSession& session) {
+ session.soupNetworkSession().setAcceptLanguages(acceptLanguages);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters& parameters)
</span></span></pre>
</div>
</div>
</body>
</html>