Attachment 28177 Details for Bug 3547 – patch

[patch] patch

patch_3547_3 (text/plain), 4.14 KB, created by Adam Bergkvist on 2009-03-02 07:43:35 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Bergkvist

Created: 2009-03-02 07:43:35 PST

Size: 4.14 KB

patch

obsolete

>Index: WebCore/ChangeLog
>===================================================================
>--- WebCore/ChangeLog	(revision 41356)
>+++ WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,19 @@
>+2009-03-02  Adam Bergkvist <adam.bergkvist@ericsson.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        https://bugs.webkit.org/show_bug.cgi?id=3547
>+        XMLHttpRequest.statusText returns always "OK"
>+
>+        Return ResourceResponse status text. It is now up to each platform
>+        to correctly set the status text or set it to "OK" to retain current
>+        behavior.
>+
>+        Test: http/tests/xmlhttprequest/status-text-custom.html
>+
>+        * xml/XMLHttpRequest.cpp:
>+        (WebCore::XMLHttpRequest::statusText):
>+
> 2009-03-02  Dirk Schulze  <krit@webkit.org>
> 
>         Reviewed by Holger Freyther.
>Index: WebCore/xml/XMLHttpRequest.cpp
>===================================================================
>--- WebCore/xml/XMLHttpRequest.cpp	(revision 41353)
>+++ WebCore/xml/XMLHttpRequest.cpp	(working copy)
>@@ -1109,16 +1109,12 @@ int XMLHttpRequest::status(ExceptionCode
> 
> String XMLHttpRequest::statusText(ExceptionCode& ec) const
> {
>-    // FIXME: <http://bugs.webkit.org/show_bug.cgi?id=3547> XMLHttpRequest.statusText returns always "OK".
>-    if (m_response.httpStatusCode())
>-        return "OK";
>-
>     if (m_state == OPENED) {
>         // See comments in getStatus() above.
>         ec = INVALID_STATE_ERR;
>     }
> 
>-    return String();
>+    return m_response.httpStatusText();
> }
> 
> void XMLHttpRequest::didFail(const ResourceError& error)
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 41356)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2009-03-02  Adam Bergkvist  <adam.bergkvist@ericsson.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        https://bugs.webkit.org/show_bug.cgi?id=3547
>+        XMLHttpRequest.statusText returns always "OK"
>+
>+        Test that xhr.statusText returns the HTTP reason phrase sent by the
>+        server.
>+
>+        * http/tests/xmlhttprequest/resources/status-text-custom.php: Added.
>+        * http/tests/xmlhttprequest/status-text-custom.html: Added.
>+
> 2009-03-01  David Levin  <levin@chromium.org>
> 
>         Reviewed by Alexey Proskuryakov.
>Index: LayoutTests/http/tests/xmlhttprequest/status-text-custom-expected.txt
>===================================================================
>--- LayoutTests/http/tests/xmlhttprequest/status-text-custom-expected.txt	(revision 0)
>+++ LayoutTests/http/tests/xmlhttprequest/status-text-custom-expected.txt	(revision 0)
>@@ -0,0 +1,4 @@
>+Test for https://bugs.webkit.org/show_bug.cgi?id=3547: XMLHttpRequest.statusText returns always "OK"
>+
>+PASS
>+
>Index: LayoutTests/http/tests/xmlhttprequest/status-text-custom.html
>===================================================================
>--- LayoutTests/http/tests/xmlhttprequest/status-text-custom.html	(revision 0)
>+++ LayoutTests/http/tests/xmlhttprequest/status-text-custom.html	(revision 0)
>@@ -0,0 +1,28 @@
>+<html>
>+<body>
>+<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=3547">https://bugs.webkit.org/show_bug.cgi?id=3547</a>:
>+XMLHttpRequest.statusText returns always "OK"
>+<div id="log"></div>
>+
>+<script>
>+if (window.layoutTestController) {
>+    layoutTestController.dumpAsText();
>+    layoutTestController.waitUntilDone();
>+}
>+
>+var xhr = new XMLHttpRequest();
>+xhr.open("GET", "resources/status-text-custom.php");
>+xhr.onreadystatechange = function() {
>+    if (xhr.readyState == 4) {
>+        var result = xhr.statusText == "Vacation" ? "PASS" : "FAIL";
>+        document.getElementById("log").innerHTML = result + "<br>";
>+
>+        if (window.layoutTestController)
>+            layoutTestController.notifyDone();
>+    }
>+};
>+xhr.send(null);
>+</script>
>+
>+</body>
>+</html>
>Index: LayoutTests/http/tests/xmlhttprequest/resources/status-text-custom.php
>===================================================================
>--- LayoutTests/http/tests/xmlhttprequest/resources/status-text-custom.php	(revision 0)
>+++ LayoutTests/http/tests/xmlhttprequest/resources/status-text-custom.php	(revision 0)
>@@ -0,0 +1,3 @@
>+<?php
>+header("HTTP/1.1 503 Vacation", 503);
>+?>

Flags:

ap: review-

Actions: View | Formatted Diff | Diff

Attachments on bug 3547: 28071 | 28171 | 28177 | 28222 | 28264 | 28306