<!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>[70034] 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/70034">70034</a></dd>
<dt>Author</dt> <dd>xan@webkit.org</dd>
<dt>Date</dt> <dd>2010-10-19 00:50:55 -0700 (Tue, 19 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>2010-10-19  Xan Lopez  &lt;xlopez@igalia.com&gt;

        Reviewed by Martin Robinson.

        [GTK] Bump minimum requirement for libsoup to 2.30
        https://bugs.webkit.org/show_bug.cgi?id=46176

        Bump minimum libsoup to required version to 2.30.0.

        * configure.ac:

WebCore:

2010-10-19  Xan Lopez  &lt;xlopez@igalia.com&gt;

        Reviewed by Martin Robinson.

        [GTK] Bump minimum requirement for libsoup to 2.30
        https://bugs.webkit.org/show_bug.cgi?id=46176

        Bump minimum required libsoup version to 2.30.

        * platform/network/soup/CookieJarSoup.cpp:
        (WebCore::defaultCookieJar):
        (WebCore::setCookies):
        * platform/network/soup/ResourceHandleSoup.cpp:
        (WebCore::ResourceHandle::prepareForURL):
        (WebCore::restartedCallback):
        (WebCore::startHttp):
        * platform/network/soup/ResourceRequestSoup.cpp:
        (WebCore::ResourceRequest::toSoupMessage):
        (WebCore::ResourceRequest::updateFromSoupMessage):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformnetworksoupCookieJarSoupcpp">trunk/WebCore/platform/network/soup/CookieJarSoup.cpp</a></li>
<li><a href="#trunkWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
<li><a href="#trunkWebCoreplatformnetworksoupResourceRequestSoupcpp">trunk/WebCore/platform/network/soup/ResourceRequestSoup.cpp</a></li>
<li><a href="#trunkconfigureac">trunk/configure.ac</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (70033 => 70034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog        2010-10-19 07:15:07 UTC (rev 70033)
+++ trunk/ChangeLog        2010-10-19 07:50:55 UTC (rev 70034)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2010-10-19  Xan Lopez  &lt;xlopez@igalia.com&gt;
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Bump minimum requirement for libsoup to 2.30
+        https://bugs.webkit.org/show_bug.cgi?id=46176
+
+        Bump minimum libsoup to required version to 2.30.0.
+
+        * configure.ac:
+
</ins><span class="cx"> 2010-10-18  Xan Lopez  &lt;xlopez@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Martin Robinson.
</span></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (70033 => 70034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-10-19 07:15:07 UTC (rev 70033)
+++ trunk/WebCore/ChangeLog        2010-10-19 07:50:55 UTC (rev 70034)
</span><span class="lines">@@ -2,6 +2,26 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Martin Robinson.
</span><span class="cx"> 
</span><ins>+        [GTK] Bump minimum requirement for libsoup to 2.30
+        https://bugs.webkit.org/show_bug.cgi?id=46176
+
+        Bump minimum required libsoup version to 2.30.
+
+        * platform/network/soup/CookieJarSoup.cpp:
+        (WebCore::defaultCookieJar):
+        (WebCore::setCookies):
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::ResourceHandle::prepareForURL):
+        (WebCore::restartedCallback):
+        (WebCore::startHttp):
+        * platform/network/soup/ResourceRequestSoup.cpp:
+        (WebCore::ResourceRequest::toSoupMessage):
+        (WebCore::ResourceRequest::updateFromSoupMessage):
+
+2010-10-19  Xan Lopez  &lt;xlopez@igalia.com&gt;
+
+        Reviewed by Martin Robinson.
+
</ins><span class="cx">         Fix distcheck, take 2.
</span><span class="cx"> 
</span><span class="cx">         * GNUmakefile.am: also move the generated CSS hash files to the
</span></span></pre></div>
<a id="trunkWebCoreplatformnetworksoupCookieJarSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/network/soup/CookieJarSoup.cpp (70033 => 70034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/network/soup/CookieJarSoup.cpp        2010-10-19 07:15:07 UTC (rev 70033)
+++ trunk/WebCore/platform/network/soup/CookieJarSoup.cpp        2010-10-19 07:50:55 UTC (rev 70034)
</span><span class="lines">@@ -38,9 +38,7 @@
</span><span class="cx">         cookiesInitialized = true;
</span><span class="cx"> 
</span><span class="cx">         cookieJar = soup_cookie_jar_new();
</span><del>-#ifdef HAVE_LIBSOUP_2_29_90
</del><span class="cx">         soup_cookie_jar_set_accept_policy(cookieJar, SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY);
</span><del>-#endif
</del><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     return cookieJar;
</span><span class="lines">@@ -67,18 +65,12 @@
</span><span class="cx"> 
</span><span class="cx">     GOwnPtr&lt;SoupURI&gt; origin(soup_uri_new(url.string().utf8().data()));
</span><span class="cx"> 
</span><del>-#ifdef HAVE_LIBSOUP_2_29_90
</del><span class="cx">     GOwnPtr&lt;SoupURI&gt; firstParty(soup_uri_new(document-&gt;firstPartyForCookies().string().utf8().data()));
</span><span class="cx"> 
</span><span class="cx">     soup_cookie_jar_set_cookie_with_first_party(jar,
</span><span class="cx">                                                 origin.get(),
</span><span class="cx">                                                 firstParty.get(),
</span><span class="cx">                                                 value.utf8().data());
</span><del>-#else
-    soup_cookie_jar_set_cookie(jar,
-                               origin.get(),
-                               value.utf8().data());
-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> String cookies(const Document* /*document*/, const KURL&amp; url)
</span></span></pre></div>
<a id="trunkWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp (70033 => 70034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp        2010-10-19 07:15:07 UTC (rev 70033)
+++ trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp        2010-10-19 07:50:55 UTC (rev 70034)
</span><span class="lines">@@ -146,12 +146,10 @@
</span><span class="cx"> 
</span><span class="cx"> void ResourceHandle::prepareForURL(const KURL &amp;url)
</span><span class="cx"> {
</span><del>-#ifdef HAVE_LIBSOUP_2_29_90
</del><span class="cx">     GOwnPtr&lt;SoupURI&gt; soupURI(soup_uri_new(url.prettyURL().utf8().data()));
</span><span class="cx">     if (!soupURI)
</span><span class="cx">         return;
</span><span class="cx">     soup_session_prepare_for_uri(ResourceHandle::defaultSession(), soupURI.get());
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // All other kinds of redirections, except for the *304* status code
</span><span class="lines">@@ -205,14 +203,12 @@
</span><span class="cx">     if (d-&gt;m_cancelled)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-#ifdef HAVE_LIBSOUP_2_29_90
</del><span class="cx">     // Update the first party in case the base URL changed with the redirect
</span><span class="cx">     String firstPartyString = request.firstPartyForCookies().string();
</span><span class="cx">     if (!firstPartyString.isEmpty()) {
</span><span class="cx">         GOwnPtr&lt;SoupURI&gt; firstParty(soup_uri_new(firstPartyString.utf8().data()));
</span><span class="cx">         soup_message_set_first_party(d-&gt;m_soupMessage.get(), firstParty.get());
</span><span class="cx">     }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static void gotHeadersCallback(SoupMessage* msg, gpointer data)
</span><span class="lines">@@ -587,13 +583,11 @@
</span><span class="cx">     g_signal_connect(soupMessage, &quot;content-sniffed&quot;, G_CALLBACK(contentSniffedCallback), handle);
</span><span class="cx">     d-&gt;m_gotChunkHandler = g_signal_connect(soupMessage, &quot;got-chunk&quot;, G_CALLBACK(gotChunkCallback), handle);
</span><span class="cx"> 
</span><del>-#ifdef HAVE_LIBSOUP_2_29_90
</del><span class="cx">     String firstPartyString = request.firstPartyForCookies().string();
</span><span class="cx">     if (!firstPartyString.isEmpty()) {
</span><span class="cx">         GOwnPtr&lt;SoupURI&gt; firstParty(soup_uri_new(firstPartyString.utf8().data()));
</span><span class="cx">         soup_message_set_first_party(soupMessage, firstParty.get());
</span><span class="cx">     }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     FormData* httpBody = d-&gt;m_firstRequest.httpBody();
</span><span class="cx">     if (httpBody &amp;&amp; !httpBody-&gt;isEmpty()) {
</span></span></pre></div>
<a id="trunkWebCoreplatformnetworksoupResourceRequestSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/network/soup/ResourceRequestSoup.cpp (70033 => 70034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/network/soup/ResourceRequestSoup.cpp        2010-10-19 07:15:07 UTC (rev 70033)
+++ trunk/WebCore/platform/network/soup/ResourceRequestSoup.cpp        2010-10-19 07:50:55 UTC (rev 70034)
</span><span class="lines">@@ -70,13 +70,11 @@
</span><span class="cx">             soup_message_headers_append(soupHeaders, it-&gt;first.string().utf8().data(), it-&gt;second.utf8().data());
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-#ifdef HAVE_LIBSOUP_2_29_90
</del><span class="cx">     String firstPartyString = firstPartyForCookies().string();
</span><span class="cx">     if (!firstPartyString.isEmpty()) {
</span><span class="cx">         GOwnPtr&lt;SoupURI&gt; firstParty(soup_uri_new(firstPartyString.utf8().data()));
</span><span class="cx">         soup_message_set_first_party(soupMessage, firstParty.get());
</span><span class="cx">     }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     soup_message_set_flags(soupMessage, m_soupFlags);
</span><span class="cx"> 
</span><span class="lines">@@ -105,13 +103,11 @@
</span><span class="cx">     if (soupMessage-&gt;request_body-&gt;data)
</span><span class="cx">         m_httpBody = FormData::create(soupMessage-&gt;request_body-&gt;data, soupMessage-&gt;request_body-&gt;length);
</span><span class="cx"> 
</span><del>-#ifdef HAVE_LIBSOUP_2_29_90
</del><span class="cx">     SoupURI* firstParty = soup_message_get_first_party(soupMessage);
</span><span class="cx">     if (firstParty) {
</span><span class="cx">         GOwnPtr&lt;gchar&gt; firstPartyURI(soup_uri_to_string(firstParty, FALSE));
</span><span class="cx">         m_firstPartyForCookies = KURL(KURL(), String::fromUTF8(firstPartyURI.get()));
</span><span class="cx">     }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     m_soupFlags = soup_message_get_flags(soupMessage);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkconfigureac"></a>
<div class="modfile"><h4>Modified: trunk/configure.ac (70033 => 70034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/configure.ac        2010-10-19 07:15:07 UTC (rev 70033)
+++ trunk/configure.ac        2010-10-19 07:50:55 UTC (rev 70034)
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> fi
</span><span class="cx"> 
</span><span class="cx"> # minimum base dependencies
</span><del>-LIBSOUP_REQUIRED_VERSION=2.28.2
</del><ins>+LIBSOUP_REQUIRED_VERSION=2.30.0
</ins><span class="cx"> CAIRO_REQUIRED_VERSION=1.6
</span><span class="cx"> FONTCONFIG_REQUIRED_VERSION=2.4
</span><span class="cx"> FREETYPE2_REQUIRED_VERSION=9.0
</span><span class="lines">@@ -797,15 +797,6 @@
</span><span class="cx"> AC_SUBST([LIBSOUP_CFLAGS])
</span><span class="cx"> AC_SUBST([LIBSOUP_LIBS])
</span><span class="cx"> 
</span><del>-# check if we can use libSoup 2.29.90 features
-PKG_CHECK_MODULES([LIBSOUP_2_29_90],
-                  [libsoup-2.4 &gt;= 2.29.90],
-                  [have_libsoup_2_29_90=yes],
-                  [have_libsoup_2_29_90=no])
-if test &quot;$have_libsoup_2_29_90&quot; = &quot;yes&quot;; then
-   AC_DEFINE([HAVE_LIBSOUP_2_29_90], 1, [Whether libSoup 2.29.90 features are available])
-fi
-
</del><span class="cx"> # check if FreeType/FontConfig are available
</span><span class="cx"> if test &quot;$with_font_backend&quot; = &quot;freetype&quot;; then
</span><span class="cx">    if test &quot;$with_target&quot; = &quot;directfb&quot;; then
</span></span></pre>
</div>
</div>

</body>
</html>