diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-24 17:10:12 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-24 17:10:12 +0000 |
| commit | 58f0bf6f76dcf9cd4dc48b1699e5313d4694825a (patch) | |
| tree | 9ee2dc502e9aeae348de4d1f610d9139378f5e5d /webkit/data | |
| parent | 15f633d4fde1ee0001ef4e1ecc0ca4d1ab8aaa43 (diff) | |
| download | chromium_src-58f0bf6f76dcf9cd4dc48b1699e5313d4694825a.zip chromium_src-58f0bf6f76dcf9cd4dc48b1699e5313d4694825a.tar.gz chromium_src-58f0bf6f76dcf9cd4dc48b1699e5313d4694825a.tar.bz2 | |
Merge WebKit r42737, which added port 3659
(apple-sasl / PasswordServer) to the list of
blocked ports and to LayoutTests/security/block-test.html.
Fix cpplint.py nits.
R=eroman
BUG=http://crbug.com/10861
TEST=LayoutTests/security/block-test.html should pass on Windows
Review URL: http://codereview.chromium.org/147069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/data')
| -rw-r--r-- | webkit/data/layout_tests/platform/chromium-win/LayoutTests/security/block-test-expected.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/security/block-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/security/block-test-expected.txt index a9287af..9553933 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/security/block-test-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/security/block-test-expected.txt @@ -111,6 +111,8 @@ http://255.255.255.255:995/test.jpg - willSendRequest <WebRequest URL "http://25 http://255.255.255.255:995/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:995/test.jpg"> http://255.255.255.255:2049/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:2049/test.jpg"> http://255.255.255.255:2049/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:2049/test.jpg"> +http://255.255.255.255:3659/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:3659/test.jpg"> +http://255.255.255.255:3659/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:3659/test.jpg"> http://255.255.255.255:4045/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:4045/test.jpg"> http://255.255.255.255:4045/test.jpg - didFailLoadingWithError <WebError code -312, failing URL "http://255.255.255.255:4045/test.jpg"> http://255.255.255.255:6000/test.jpg - willSendRequest <WebRequest URL "http://255.255.255.255:6000/test.jpg"> |