Changeset 70038 in webkit


Ignore:
Timestamp:
Oct 19, 2010 1:30:03 AM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2010-10-19 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r70034.
​http://trac.webkit.org/changeset/70034
​https://bugs.webkit.org/show_bug.cgi?id=47889

"Gustavo's bot is lame" (Requested by xan_ on #webkit).

  • configure.ac:

2010-10-19 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r70034.
​http://trac.webkit.org/changeset/70034
​https://bugs.webkit.org/show_bug.cgi?id=47889

"Gustavo's bot is lame" (Requested by xan_ on #webkit).

  • 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):
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r70035 r70038  
     12010-10-19  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r70034.
     4        http://trac.webkit.org/changeset/70034
     5        https://bugs.webkit.org/show_bug.cgi?id=47889
     6
     7        "Gustavo's bot is lame" (Requested by xan_ on #webkit).
     8
     9        * configure.ac:
     10
    1112010-10-19  Prof. MAAD  <himself@prof-maad.org>
    212

  • trunk/WebCore/ChangeLog

    r70034 r70038  
     12010-10-19  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r70034.
     4        http://trac.webkit.org/changeset/70034
     5        https://bugs.webkit.org/show_bug.cgi?id=47889
     6
     7        "Gustavo's bot is lame" (Requested by xan_ on #webkit).
     8
     9        * platform/network/soup/CookieJarSoup.cpp:
     10        (WebCore::defaultCookieJar):
     11        (WebCore::setCookies):
     12        * platform/network/soup/ResourceHandleSoup.cpp:
     13        (WebCore::ResourceHandle::prepareForURL):
     14        (WebCore::restartedCallback):
     15        (WebCore::startHttp):
     16        * platform/network/soup/ResourceRequestSoup.cpp:
     17        (WebCore::ResourceRequest::toSoupMessage):
     18        (WebCore::ResourceRequest::updateFromSoupMessage):
     19
    1202010-10-19  Xan Lopez  <xlopez@igalia.com>
    221

  • trunk/WebCore/platform/network/soup/CookieJarSoup.cpp

    r70034 r70038  
    3939
    4040        cookieJar = soup_cookie_jar_new();
     41#ifdef HAVE_LIBSOUP_2_29_90
    4142        soup_cookie_jar_set_accept_policy(cookieJar, SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY);
     43#endif
    4244    }
    4345
    … …  
    6668    GOwnPtr<SoupURI> origin(soup_uri_new(url.string().utf8().data()));
    6769
     70#ifdef HAVE_LIBSOUP_2_29_90
    6871    GOwnPtr<SoupURI> firstParty(soup_uri_new(document->firstPartyForCookies().string().utf8().data()));
    6972
    … …  
    7275                                                firstParty.get(),
    7376                                                value.utf8().data());
     77#else
     78    soup_cookie_jar_set_cookie(jar,
     79                               origin.get(),
     80                               value.utf8().data());
     81#endif
    7482}
    7583

  • trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp

    r70034 r70038  
    147147void ResourceHandle::prepareForURL(const KURL &url)
    148148{
     149#ifdef HAVE_LIBSOUP_2_29_90
    149150    GOwnPtr<SoupURI> soupURI(soup_uri_new(url.prettyURL().utf8().data()));
    150151    if (!soupURI)
    151152        return;
    152153    soup_session_prepare_for_uri(ResourceHandle::defaultSession(), soupURI.get());
     154#endif
    153155}
    154156
    … …  
    204206        return;
    205207
     208#ifdef HAVE_LIBSOUP_2_29_90
    206209    // Update the first party in case the base URL changed with the redirect
    207210    String firstPartyString = request.firstPartyForCookies().string();
    … …  
    210213        soup_message_set_first_party(d->m_soupMessage.get(), firstParty.get());
    211214    }
     215#endif
    212216}
    213217
    … …  
    584588    d->m_gotChunkHandler = g_signal_connect(soupMessage, "got-chunk", G_CALLBACK(gotChunkCallback), handle);
    585589
     590#ifdef HAVE_LIBSOUP_2_29_90
    586591    String firstPartyString = request.firstPartyForCookies().string();
    587592    if (!firstPartyString.isEmpty()) {
    … …  
    589594        soup_message_set_first_party(soupMessage, firstParty.get());
    590595    }
     596#endif
    591597
    592598    FormData* httpBody = d->m_firstRequest.httpBody();

  • trunk/WebCore/platform/network/soup/ResourceRequestSoup.cpp

    r70034 r70038  
    7171    }
    7272
     73#ifdef HAVE_LIBSOUP_2_29_90
    7374    String firstPartyString = firstPartyForCookies().string();
    7475    if (!firstPartyString.isEmpty()) {
    … …  
    7677        soup_message_set_first_party(soupMessage, firstParty.get());
    7778    }
     79#endif
    7880
    7981    soup_message_set_flags(soupMessage, m_soupFlags);
    … …  
    104106        m_httpBody = FormData::create(soupMessage->request_body->data, soupMessage->request_body->length);
    105107
     108#ifdef HAVE_LIBSOUP_2_29_90
    106109    SoupURI* firstParty = soup_message_get_first_party(soupMessage);
    107110    if (firstParty) {
    … …  
    109112        m_firstPartyForCookies = KURL(KURL(), String::fromUTF8(firstPartyURI.get()));
    110113    }
     114#endif
    111115
    112116    m_soupFlags = soup_message_get_flags(soupMessage);

  • trunk/configure.ac

    r70034 r70038  
    248248
    249249# minimum base dependencies
    250 LIBSOUP_REQUIRED_VERSION=2.30.0
     250LIBSOUP_REQUIRED_VERSION=2.28.2
    251251CAIRO_REQUIRED_VERSION=1.6
    252252FONTCONFIG_REQUIRED_VERSION=2.4
    … …  
    797797AC_SUBST([LIBSOUP_CFLAGS])
    798798AC_SUBST([LIBSOUP_LIBS])
     799
     800# check if we can use libSoup 2.29.90 features
     801PKG_CHECK_MODULES([LIBSOUP_2_29_90],
     802                  [libsoup-2.4 >= 2.29.90],
     803                  [have_libsoup_2_29_90=yes],
     804                  [have_libsoup_2_29_90=no])
     805if test "$have_libsoup_2_29_90" = "yes"; then
     806   AC_DEFINE([HAVE_LIBSOUP_2_29_90], 1, [Whether libSoup 2.29.90 features are available])
     807fi
    799808
    800809# check if FreeType/FontConfig are available
Note: See TracChangeset for help on using the changeset viewer.