[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
Gustavo Noronha Silva
gns at gnome.org
Thu Apr 8 02:24:40 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit cf574a9ed716fea61e4d85fc25b8e6e5ef4e04cc
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Mar 25 06:07:24 2010 +0000
Revert the portion of r56489 that dealt with port zero as it introduced some test failures.
WebCore:
* platform/KURL.cpp:
(WebCore::KURL::port): Use the "ok" argument to charactersToUIntStrict to determine whether
it was able to successfully parse the string as an unsigned integer, rather than relying on
the fact it returned zero when it failed.
LayoutTests:
* platform/mac/security/block-test-expected.txt:
* security/block-test.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56492 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c2f637c..d7055ae 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,12 @@
2010-03-24 Mark Rowe <mrowe at apple.com>
+ Revert the portion of r56489 that dealt with port zero as it introduced some test failures.
+
+ * platform/mac/security/block-test-expected.txt:
+ * security/block-test.html:
+
+2010-03-24 Mark Rowe <mrowe at apple.com>
+
Reviewed by Darin Adler.
WebKit should treat port numbers outside the valid range as being blacklisted
diff --git a/LayoutTests/platform/mac/security/block-test-expected.txt b/LayoutTests/platform/mac/security/block-test-expected.txt
index e88931c..883b4b8 100644
--- a/LayoutTests/platform/mac/security/block-test-expected.txt
+++ b/LayoutTests/platform/mac/security/block-test-expected.txt
@@ -1,9 +1,7 @@
-http://255.255.255.255:0/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:0/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
http://255.255.255.255:1/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:1/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-http://255.255.255.255:0/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:0/test.jpg">
-http://255.255.255.255:1/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:1/test.jpg">
+<unknown> - didFinishLoading
http://255.255.255.255:7/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:7/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:1/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:1/test.jpg">
http://255.255.255.255:7/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:7/test.jpg">
http://255.255.255.255:9/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:9/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
http://255.255.255.255:9/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:9/test.jpg">
diff --git a/LayoutTests/security/block-test.html b/LayoutTests/security/block-test.html
index 981eb25..1b338eb 100644
--- a/LayoutTests/security/block-test.html
+++ b/LayoutTests/security/block-test.html
@@ -1,7 +1,7 @@
<html>
<script>
- // Note that port "0" is tested by the initial load.
- var blockedPorts = new Array(1, 7, 9, 11, 13, 15, 17, 19, 20,
+ // Note that port "1" is tested by the initial load.
+ var blockedPorts = new Array(7, 9, 11, 13, 15, 17, 19, 20,
21, 22, 23, 25, 37, 42, 43, 53, 77, 79, 87, 95, 101, 102,
103, 104, 109, 110, 111, 113, 115, 117, 119, 123, 135, 139,
143, 179, 389, 465, 512, 513, 514, 515, 526, 530, 531, 532,
@@ -62,6 +62,6 @@
correct error for them - blocked instead of cannot find. It also tries the FTP ports for exemptions. Due to the
nature of this test, the results can only be processed automatically via DumpRenderTree
</p>
-<img id="testIMG" src="http://255.255.255.255:0/test.jpg" onError="nextTest();"></img>
+<img id="testIMG" src="http://255.255.255.255:1/test.jpg" onError="nextTest();"></img>
</body>
</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a8de44e..bfb62ff 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
2010-03-24 Mark Rowe <mrowe at apple.com>
+ Revert the portion of r56489 that dealt with port zero as it introduced some test failures.
+
+ * platform/KURL.cpp:
+ (WebCore::KURL::port): Use the "ok" argument to charactersToUIntStrict to determine whether
+ it was able to successfully parse the string as an unsigned integer, rather than relying on
+ the fact it returned zero when it failed.
+
+2010-03-24 Mark Rowe <mrowe at apple.com>
+
Reviewed by Darin Adler.
WebKit should treat port numbers outside the valid range as being blacklisted
diff --git a/WebCore/platform/KURL.cpp b/WebCore/platform/KURL.cpp
index 9a67479..338793f 100644
--- a/WebCore/platform/KURL.cpp
+++ b/WebCore/platform/KURL.cpp
@@ -580,8 +580,9 @@ unsigned short KURL::port() const
return 0;
const UChar* stringData = m_string.characters();
- unsigned number = charactersToUIntStrict(stringData + m_hostEnd + 1, m_portEnd - m_hostEnd - 1);
- if (!number || number > maximumValidPortNumber)
+ bool ok = false;
+ unsigned number = charactersToUIntStrict(stringData + m_hostEnd + 1, m_portEnd - m_hostEnd - 1, &ok);
+ if (!ok || number > maximumValidPortNumber)
return invalidPortNumber;
return number;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list