Changeset 57351 in webkit


Ignore:
Timestamp:
Apr 9, 2010 1:01:20 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-04-09 Andrey Kosyakov <​caseq@chromium.org>

Reviewed by Darin Adler.

Changed expectation for text status for HTTP status of 4xx following
a fix for localized status messages.
​https://bugs.webkit.org/show_bug.cgi?id=37274

  • platform/mac/http/tests/xmlhttprequest/web-apps/013-expected.txt:
  • platform/mac/http/tests/xmlhttprequest/xmlhttprequest-missing-file-exception-expected.txt:

2010-04-09 Andrey Kosyakov <​caseq@chromium.org>

Reviewed by Darin Adler.

Fixed ResourceError::failingURL() and ResourceResponse::httpStatusText()
to return meaningful values.
​https://bugs.webkit.org/show_bug.cgi?id=37274

  • platform/network/mac/ResourceErrorMac.mm: (WebCore::ResourceError::platformLazyInit):
  • platform/network/mac/ResourceResponseMac.mm: (WebCore::ResourceResponse::platformLazyInit):
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r57349 r57351  
     12010-04-09  Andrey Kosyakov  <caseq@chromium.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Changed expectation for text status for HTTP status of 4xx following
     6        a fix for localized status messages.
     7        https://bugs.webkit.org/show_bug.cgi?id=37274
     8
     9        * platform/mac/http/tests/xmlhttprequest/web-apps/013-expected.txt:
     10        * platform/mac/http/tests/xmlhttprequest/xmlhttprequest-missing-file-exception-expected.txt:
     11
    1122010-04-09  Dmitry Titov  <dimich@chromium.org>
    213

  • trunk/LayoutTests/platform/mac/http/tests/xmlhttprequest/web-apps/013-expected.txt

    r41665 r57351  
    1 FAIL: Status at readyState 3 was: 400, "OK"
     1FAIL: Status at readyState 3 was: 400, "bad request"

  • trunk/LayoutTests/platform/mac/http/tests/xmlhttprequest/xmlhttprequest-missing-file-exception-expected.txt

    r47790 r57351  
    66responseXML: null (object)
    77status: 404 (number)
    8 statusText: OK (string)
     8statusText: not found (string)
    99

  • trunk/WebCore/ChangeLog

    r57350 r57351  
     12010-04-09  Andrey Kosyakov  <caseq@chromium.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Fixed ResourceError::failingURL() and ResourceResponse::httpStatusText()
     6        to return meaningful values.
     7        https://bugs.webkit.org/show_bug.cgi?id=37274
     8
     9        * platform/network/mac/ResourceErrorMac.mm:
     10        (WebCore::ResourceError::platformLazyInit):
     11        * platform/network/mac/ResourceResponseMac.mm:
     12        (WebCore::ResourceResponse::platformLazyInit):
     13
    1142010-04-09  Jeremy Orlow  <jorlow@chromium.org>
    215

  • trunk/WebCore/platform/network/mac/ResourceErrorMac.mm

    r47907 r57351  
    4848    if (!failingURLString)
    4949        failingURLString = [[[m_platformError.get() userInfo] valueForKey:@"NSErrorFailingURLKey"] absoluteString];
    50    
     50    m_failingURL = failingURLString;
    5151    // Workaround for <rdar://problem/6554067>
    52     m_localizedDescription = failingURLString;
     52    m_localizedDescription = m_failingURL;
    5353    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    5454    m_localizedDescription = [m_platformError.get() _web_localizedDescription];

  • trunk/WebCore/platform/network/mac/ResourceResponseMac.mm

    r45504 r57351  
    8080        m_httpStatusCode = [httpResponse statusCode];
    8181       
    82         // FIXME: it would be nice to have a way to get the real status text eventually.
    83         m_httpStatusText = "OK";
     82        // we used to return "OK" for everything, so be compatible and return "OK" for 200.
     83        m_httpStatusText = m_httpStatusCode == 200 ? String("OK")
     84            : String([NSHTTPURLResponse localizedStringForStatusCode: m_httpStatusCode]);
    8485       
    8586        NSDictionary *headers = [httpResponse allHeaderFields];
Note: See TracChangeset for help on using the changeset viewer.