Changeset 89094 in webkit


Ignore:
Timestamp:
Jun 16, 2011 5:56:17 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-06-16 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r89055.
​http://trac.webkit.org/changeset/89055
​https://bugs.webkit.org/show_bug.cgi?id=62835

Caused failures on all ports except GTK (Requested by
mrobinson on #webkit).

  • http/tests/loading/resources/status-code-error-with-response-body.php: Removed.
  • http/tests/loading/resources/status-code-error-without-response-body.php: Removed.
  • http/tests/loading/status-code-error-without-response-body-expected.txt: Removed.
  • http/tests/loading/status-code-error-without-response-body.html: Removed.
  • platform/chromium/test_expectations.txt:

2011-06-16 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r89055.
​http://trac.webkit.org/changeset/89055
​https://bugs.webkit.org/show_bug.cgi?id=62835

Caused failures on all ports except GTK (Requested by
mrobinson on #webkit).

  • platform/network/soup/ResourceHandleSoup.cpp: (WebCore::statusWillBeHandledBySoup): (WebCore::soupErrorShouldCauseLoadFailure): (WebCore::convertSoupErrorToResourceError): (WebCore::sendRequestCallback):
Location:
trunk
Files:
4 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r89092 r89094  
     12011-06-16  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r89055.
     4        http://trac.webkit.org/changeset/89055
     5        https://bugs.webkit.org/show_bug.cgi?id=62835
     6
     7        Caused failures on all ports except GTK (Requested by
     8        mrobinson on #webkit).
     9
     10        * http/tests/loading/resources/status-code-error-with-response-body.php: Removed.
     11        * http/tests/loading/resources/status-code-error-without-response-body.php: Removed.
     12        * http/tests/loading/status-code-error-without-response-body-expected.txt: Removed.
     13        * http/tests/loading/status-code-error-without-response-body.html: Removed.
     14        * platform/chromium/test_expectations.txt:
     15
    1162011-06-16  Wyatt Carss  <wcarss@chromium.org>
    217

  • trunk/LayoutTests/platform/chromium/test_expectations.txt

    r89062 r89094  
    211211// Unskip after implementing LayoutTestController::setDefersLoading and ::goBack.
    212212BUGWK60877 SKIP : loader/navigation-while-deferring-loads.html = FAIL
    213 
    214 BUGWK60875 SKIP : http/tests/loading/status-code-error-without-response-body.html = FAIL
    215213
    216214// -----------------------------------------------------------------

  • trunk/Source/WebCore/ChangeLog

    r89091 r89094  
     12011-06-16  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r89055.
     4        http://trac.webkit.org/changeset/89055
     5        https://bugs.webkit.org/show_bug.cgi?id=62835
     6
     7        Caused failures on all ports except GTK (Requested by
     8        mrobinson on #webkit).
     9
     10        * platform/network/soup/ResourceHandleSoup.cpp:
     11        (WebCore::statusWillBeHandledBySoup):
     12        (WebCore::soupErrorShouldCauseLoadFailure):
     13        (WebCore::convertSoupErrorToResourceError):
     14        (WebCore::sendRequestCallback):
     15
    1162011-06-16  Ryosuke Niwa  <rniwa@webkit.org>
    217

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

    r89055 r89094  
    195195{
    196196    if (SOUP_STATUS_IS_TRANSPORT_ERROR(statusCode)
    197         || SOUP_STATUS_IS_CLIENT_ERROR(statusCode)
    198         || SOUP_STATUS_IS_SERVER_ERROR(statusCode)
    199197        || (SOUP_STATUS_IS_REDIRECTION(statusCode) && (statusCode != SOUP_STATUS_NOT_MODIFIED))
    200198        || (statusCode == SOUP_STATUS_UNAUTHORIZED))
    … …  
    406404}
    407405
    408 static bool receivedClientOrServerErrorWithoutBody(SoupMessage* message)
    409 {
    410     if ((message && SOUP_STATUS_IS_CLIENT_ERROR(message->status_code))
    411         || (message && SOUP_STATUS_IS_SERVER_ERROR(message->status_code))) {
    412         if (!message->response_body || !message->response_body->length)
    413             return true;
    414     }
    415 
    416     return false;
    417 }
    418 
    419406static bool soupErrorShouldCauseLoadFailure(GError* error, SoupMessage* message)
    420407{
    421408    // Libsoup treats some non-error conditions as errors, including redirects and 304 Not Modified responses.
    422     return (message && SOUP_STATUS_IS_TRANSPORT_ERROR(message->status_code))
    423             || receivedClientOrServerErrorWithoutBody(message)
    424             || error->domain == G_IO_ERROR;
     409    return message && SOUP_STATUS_IS_TRANSPORT_ERROR(message->status_code) || error->domain == G_IO_ERROR;
    425410}
    426411
    … …  
    431416
    432417    GOwnPtr<char> uri(soup_uri_to_string(soup_request_get_uri(request), FALSE));
    433     if ((message && SOUP_STATUS_IS_TRANSPORT_ERROR(message->status_code)) || receivedClientOrServerErrorWithoutBody(message)) {
     418    if (message && SOUP_STATUS_IS_TRANSPORT_ERROR(message->status_code)) {
    434419        return ResourceError(g_quark_to_string(SOUP_HTTP_ERROR),
    435420                             static_cast<gint>(message->status_code),
    … …  
    482467            d->m_response.updateFromSoupMessage(soupMessage);
    483468            client->didReceiveResponse(handle.get(), d->m_response);
    484 
    485             // handle->client() can be zero on above client->didReceiveResponse() if there is something wrong on received response.
    486             // It means cancel from WebCore, so, we need to check it again here.
    487             if (d->m_cancelled || !(handle->client())) {
    488                 cleanupSoupRequestOperation(handle.get());
    489                 return;
    490             }
    491469
    492470            // WebCore might have cancelled the job in the while. We
Note: See TracChangeset for help on using the changeset viewer.