WebCore:

2009-04-21  Sam Weinig  <sam@webkit.org>

        Reviewed by Dan Bernstein.

        Fix for <rdar://problem/5874009>
        Add port 3659 (apple-sasl / PasswordServer) to the list of blocked ports.

        * platform/network/ResourceHandle.cpp:
        (WebCore::portAllowed):

LayoutTests:

2009-04-21  Sam Weinig  <sam@webkit.org>

        Reviewed by Dan Bernstein.

        Update test and results for <rdar://problem/5874009>
        Add port 3659 (apple-sasl / PasswordServer) to the list of blocked ports.

        * platform/mac-tiger/security/block-test-expected.txt:
        * platform/mac/security/block-test-expected.txt:
        * security/block-test.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@42737 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ae6a2d00a9902077ee28b2e58eb0044152646dc2..f328a5b5f4a087738c578d54d4deb32229055414 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-04-21  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        Update test and results for <rdar://problem/5874009>
+        Add port 3659 (apple-sasl / PasswordServer) to the list of blocked ports.
+
+        * platform/mac-tiger/security/block-test-expected.txt:
+        * platform/mac/security/block-test-expected.txt:
+        * security/block-test.html:
+
 2009-04-21  Justin Garcia  <justin.garcia@apple.com>
         
         Reviewed by Dan Bernstein.

diff --git a/LayoutTests/platform/mac-tiger/security/block-test-expected.txt b/LayoutTests/platform/mac-tiger/security/block-test-expected.txt
index a86364b8d46eca388ecceedf6b8ec31ac28f52fb..9a7d7bfc15c8ceffa828cfacfc3aea73398c3a3a 100644 (file)
--- a/LayoutTests/platform/mac-tiger/security/block-test-expected.txt
+++ b/LayoutTests/platform/mac-tiger/security/block-test-expected.txt
@@ -111,6 +111,8 @@ http://255.255.255.255:995/test.jpg - willSendRequest <NSURLRequest URL http://2
 http://255.255.255.255:995/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:995/test.jpg">
 http://255.255.255.255:2049/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:2049/test.jpg, main document URL block-test.html> redirectResponse (null)
 http://255.255.255.255:2049/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:2049/test.jpg">
+http://255.255.255.255:3659/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:3659/test.jpg, main document URL block-test.html> redirectResponse (null)
+http://255.255.255.255:3659/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:3659/test.jpg">
 http://255.255.255.255:4045/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:4045/test.jpg, main document URL block-test.html> redirectResponse (null)
 http://255.255.255.255:4045/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:4045/test.jpg">
 http://255.255.255.255:6000/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6000/test.jpg, main document URL block-test.html> redirectResponse (null)

diff --git a/LayoutTests/platform/mac/security/block-test-expected.txt b/LayoutTests/platform/mac/security/block-test-expected.txt
index fd62a02d590211fa348b8f42fd9e20fa5a89b413..6ac5e500ec6d2562454ff62e5e4157558ef312a8 100644 (file)
--- a/LayoutTests/platform/mac/security/block-test-expected.txt
+++ b/LayoutTests/platform/mac/security/block-test-expected.txt
@@ -111,6 +111,8 @@ http://255.255.255.255:995/test.jpg - willSendRequest <NSURLRequest URL http://2
 http://255.255.255.255:995/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:995/test.jpg">
 http://255.255.255.255:2049/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:2049/test.jpg, main document URL block-test.html> redirectResponse (null)
 http://255.255.255.255:2049/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:2049/test.jpg">
+http://255.255.255.255:3659/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:3659/test.jpg, main document URL block-test.html> redirectResponse (null)
+http://255.255.255.255:3659/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:3659/test.jpg">
 http://255.255.255.255:4045/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:4045/test.jpg, main document URL block-test.html> redirectResponse (null)
 http://255.255.255.255:4045/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:4045/test.jpg">
 http://255.255.255.255:6000/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6000/test.jpg, main document URL block-test.html> redirectResponse (null)

diff --git a/LayoutTests/security/block-test.html b/LayoutTests/security/block-test.html
index edc1483f9dfab1c7463a6f2bdfd566843b52bb78..66a7952f787dac141c2ce4dcda36f129ce6215b6 100644 (file)
--- a/LayoutTests/security/block-test.html
+++ b/LayoutTests/security/block-test.html
@@ -5,7 +5,7 @@
       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,
-      540, 556, 563, 587, 601, 636, 993, 995, 2049, 4045, 6000, 0);
+      540, 556, 563, 587, 601, 636, 993, 995, 2049, 3659, 4045, 6000, 0);
     
     var baseURL = "255.255.255.255";
     var currentPort = 0;

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 44b3661461dd09eda7901dc1f4d433df5cdee6ca..04ecfbe3f03e894d73b2a685d65792233246a353 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-04-21  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        Fix for <rdar://problem/5874009>
+        Add port 3659 (apple-sasl / PasswordServer) to the list of blocked ports.
+
+        * platform/network/ResourceHandle.cpp:
+        (WebCore::portAllowed):
+
 2009-04-21  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by Dan Bernstein.

diff --git a/WebCore/platform/network/ResourceHandle.cpp b/WebCore/platform/network/ResourceHandle.cpp
index 149411e90d32f1462f3904c960dac2191acd1953..a7320b9fb29960be95e2642deb4d6cca209571de 100644 (file)
--- a/WebCore/platform/network/ResourceHandle.cpp
+++ b/WebCore/platform/network/ResourceHandle.cpp
@@ -178,6 +178,7 @@ static bool portAllowed(const ResourceRequest& request)
         993,  // IMAP+SSL
         995,  // POP3+SSL
         2049, // NFS
+        3659, // apple-sasl / PasswordServer [Apple addition]
         4045, // lockd
         6000, // X11
     };