diff options
| author | mmenke@google.com <mmenke@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 15:06:44 +0000 |
|---|---|---|
| committer | mmenke@google.com <mmenke@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 15:06:44 +0000 |
| commit | 7e2e2720df303d4c172c2dcf24bb0b1b3616bf90 (patch) | |
| tree | 44a557b66ca310b1ce8ac9644cbd6a036f770ac4 /webkit/support | |
| parent | 40d4c918146767f51aa7ab7b0d6358ded099d1f2 (diff) | |
| download | chromium_src-7e2e2720df303d4c172c2dcf24bb0b1b3616bf90.zip chromium_src-7e2e2720df303d4c172c2dcf24bb0b1b3616bf90.tar.gz chromium_src-7e2e2720df303d4c172c2dcf24bb0b1b3616bf90.tar.bz2 | |
Modify GetErrorDescription to give a -1004 (NSURLErrorCannotConnectToHost)
when passed a net::ERR_NETWORK_ACCESS_DENIED error. This results in a
error code being output by the security/block-test-no-port.html
layout test on OSX that is consistent with other platforms.
The test is also temporarily disabled on OSX until the expected results
are updated.
BUG=61655
TEST=security/block-test-no-port.html (Currently disabled)
Review URL: http://codereview.chromium.org/5012005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
| -rw-r--r-- | webkit/support/webkit_support.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index eb839a1..f6d0b24 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -464,7 +464,7 @@ std::string MakeURLErrorDescription(const WebKit::WebURLError& error) { domain = "NSURLErrorDomain"; switch (error.reason) { case net::ERR_ABORTED: - code = -999; + code = -999; // NSURLErrorCancelled break; case net::ERR_UNSAFE_PORT: // Our unsafe port checking happens at the network stack level, but we @@ -474,7 +474,8 @@ std::string MakeURLErrorDescription(const WebKit::WebURLError& error) { break; case net::ERR_ADDRESS_INVALID: case net::ERR_ADDRESS_UNREACHABLE: - code = -1004; + case net::ERR_NETWORK_ACCESS_DENIED: + code = -1004; // NSURLErrorCannotConnectToHost break; } } else |