Changeset 106810 in webkit

Timestamp:

Feb 6, 2012 8:39:23 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Blackberry] Non-supported about: operations never stops loading
​https://bugs.webkit.org/show_bug.cgi?id=76366

Patch by Chris Guan <​chris.guan@torchmobile.com.cn> on 2012-02-06
Reviewed by Rob Buis.

If user typed a non-supported "about:" scheme such as "about:nonsupport",
the loadAboutURL() function in NetworkManger should recognize and handle it as
an error of invalid url.

• platform/network/blackberry/NetworkJob.cpp:

(WebCore::NetworkJob::loadAboutURL):
(WebCore::NetworkJob::handleAbout):

• platform/network/blackberry/NetworkJob.h:

(NetworkJob):

• platform/network/blackberry/NetworkManager.cpp:

(WebCore::NetworkManager::startJob):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/blackberry/NetworkJob.cpp (modified) (2 diffs)
• platform/network/blackberry/NetworkJob.h (modified) (1 diff)
• platform/network/blackberry/NetworkManager.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-06  Chris Guan  <chris.guan@torchmobile.com.cn>
+
+        [Blackberry] Non-supported about: operations never stops loading
+        https://bugs.webkit.org/show_bug.cgi?id=76366
+
+        Reviewed by Rob Buis.
+
+        If user typed a non-supported "about:" scheme such as "about:nonsupport",
+        the loadAboutURL() function in NetworkManger should recognize and handle it as 
+        an error of invalid url.
+
+        * platform/network/blackberry/NetworkJob.cpp:
+        (WebCore::NetworkJob::loadAboutURL):
+        (WebCore::NetworkJob::handleAbout):
+        * platform/network/blackberry/NetworkJob.h:
+        (NetworkJob):
+        * platform/network/blackberry/NetworkManager.cpp:
+        (WebCore::NetworkManager::startJob):
+
 2012-02-06  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp

@@ -158 +158 @@
 }
 
-bool NetworkJob::loadAboutURL()
-{
-    // First 6 chars are "about:".
-    String aboutWhat(m_response.url().string().substring(6));
-
-    if (!aboutWhat.isEmpty()
-            && !equalIgnoringCase(aboutWhat, "blank")
-            && !equalIgnoringCase(aboutWhat, "credits")
-#if !defined(PUBLIC_BUILD) || !PUBLIC_BUILD
-            && !aboutWhat.startsWith("cache?query=", false)
-            && !equalIgnoringCase(aboutWhat, "cache")
-            && !equalIgnoringCase(aboutWhat, "cache/enable")
-            && !equalIgnoringCase(aboutWhat, "cache/disable")
-            && !equalIgnoringCase(aboutWhat, "version")
-            && (!BlackBerry::Platform::debugSetting()
-                || (!equalIgnoringCase(aboutWhat, "config")
-                    && !equalIgnoringCase(aboutWhat, "build")
-                    && !equalIgnoringCase(aboutWhat, "memory")))
-#endif
-            )
-        return false;
-
+void NetworkJob::loadAboutURL()
+{
     m_loadAboutTimer.startOneShot(0);
-    return true;
 }
 
@@ -980 +959 @@
     }
 
-    CString resultString = result.utf8();
-
-    notifyStatusReceived(handled ? 404 : 200, 0);
-    notifyStringHeaderReceived("Content-Length", String::number(resultString.length()));
-    notifyStringHeaderReceived("Content-Type", "text/html");
-    notifyDataReceivedPlain(resultString.data(), resultString.length());
-    notifyClose(BlackBerry::Platform::FilterStream::StatusSuccess);
+    if (handled) {
+        CString resultString = result.utf8();
+        notifyStatusReceived(404, 0);
+        notifyStringHeaderReceived("Content-Length", String::number(resultString.length()));
+        notifyStringHeaderReceived("Content-Type", "text/html");
+        notifyDataReceivedPlain(resultString.data(), resultString.length());
+        notifyClose(BlackBerry::Platform::FilterStream::StatusSuccess);
+    } else {
+        // If we can not handle it, we take it as an error of invalid URL.
+        notifyStatusReceived(BlackBerry::Platform::FilterStream::StatusErrorInvalidUrl, 0);
+        notifyClose(BlackBerry::Platform::FilterStream::StatusErrorInvalidUrl);
+    }
 }
 

trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h

@@ -61 +61 @@
     bool clientIsOk() const { return !m_cancelled && m_handle && m_handle->client(); }
     void loadDataURL() { m_loadDataTimer.startOneShot(0); }
-    bool loadAboutURL();
+    void loadAboutURL();
     int cancelJob();
     bool isDeferringLoading() const { return m_deferLoadingCount > 0; }

trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp

@@ -151 +151 @@
 
     if (url.protocolIs("about")) {
-        // Try to handle the url internally; if it isn't recognized, continue and pass it to the client.
-        if (networkJob->loadAboutURL())
-            return true;
+        // If the protocol matches "about", loadAboutURL should recognize and handle it.
+        networkJob->loadAboutURL();
+        return true;
     }