[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

beidson at apple.com beidson at apple.com
Thu Feb 4 21:36:00 UTC 2010 

The following commit has been merged in the webkit-1.1 branch:
commit 6db26da3c573e42a157eb317ffce809e058bee5e
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 2 03:06:31 2010 +0000

    WebCore: Add common IRC ports to port blocking.
    <rdar://problem/7593895> and https://bugs.webkit.org/show_bug.cgi?id=34451
    
    Reviewed by Tim Hatcher.
    
    * platform/KURL.cpp:
    (WebCore::portAllowed):
    
    LayoutTests: Add common IRC ports to port blocking.
    <rdar://problem/7593895> and https://bugs.webkit.org/show_bug.cgi?id=34451
    * platform/mac-tiger/security/block-test-expected.txt:
    * platform/mac/security/block-test-expected.txt:
    * security/block-test.html:
    
    Reviewed by Tim Hatcher.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54193 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5c56114..5a19bf0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-01  Brady Eidson  <beidson at apple.com>
+
+        Reviewed by Tim Hatcher.
+
+        Add common IRC ports to port blocking.
+        <rdar://problem/7593895> and https://bugs.webkit.org/show_bug.cgi?id=34451
+        * platform/mac-tiger/security/block-test-expected.txt:
+        * platform/mac/security/block-test-expected.txt:
+        * security/block-test.html:
+
 2010-02-01  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/LayoutTests/platform/mac-tiger/security/block-test-expected.txt b/LayoutTests/platform/mac-tiger/security/block-test-expected.txt
index c3b5b38..ca21e98 100644
--- a/LayoutTests/platform/mac-tiger/security/block-test-expected.txt
+++ b/LayoutTests/platform/mac-tiger/security/block-test-expected.txt
@@ -117,6 +117,16 @@ http://255.255.255.255:4045/test.jpg - willSendRequest <NSURLRequest URL http://
 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, http method GET> redirectResponse (null)
 http://255.255.255.255:6000/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6000/test.jpg">
+http://255.255.255.255:6665/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6665/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:6665/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6665/test.jpg">
+http://255.255.255.255:6666/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6666/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:6666/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6666/test.jpg">
+http://255.255.255.255:6667/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6667/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:6667/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6667/test.jpg">
+http://255.255.255.255:6668/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6668/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:6668/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6668/test.jpg">
+http://255.255.255.255:6669/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6669/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:6669/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6669/test.jpg">
 ftp://255.255.255.255/test.jpg - willSendRequest <NSURLRequest URL ftp://255.255.255.255/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 ftp://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSPOSIXErrorDomain, code 13, failing URL "ftp://255.255.255.255/test.jpg">
 ftp://255.255.255.255:21/test.jpg - willSendRequest <NSURLRequest URL ftp://255.255.255.255:21/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
diff --git a/LayoutTests/platform/mac/security/block-test-expected.txt b/LayoutTests/platform/mac/security/block-test-expected.txt
index 68ed328..b765ea0 100644
--- a/LayoutTests/platform/mac/security/block-test-expected.txt
+++ b/LayoutTests/platform/mac/security/block-test-expected.txt
@@ -117,6 +117,16 @@ http://255.255.255.255:4045/test.jpg - willSendRequest <NSURLRequest URL http://
 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, http method GET> redirectResponse (null)
 http://255.255.255.255:6000/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6000/test.jpg">
+http://255.255.255.255:6665/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6665/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:6665/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6665/test.jpg">
+http://255.255.255.255:6666/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6666/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:6666/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6666/test.jpg">
+http://255.255.255.255:6667/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6667/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:6667/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6667/test.jpg">
+http://255.255.255.255:6668/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6668/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:6668/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6668/test.jpg">
+http://255.255.255.255:6669/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6669/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:6669/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6669/test.jpg">
 ftp://255.255.255.255/test.jpg - willSendRequest <NSURLRequest URL ftp://255.255.255.255/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 ftp://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1, failing URL "ftp://255.255.255.255/test.jpg">
 ftp://255.255.255.255:21/test.jpg - willSendRequest <NSURLRequest URL ftp://255.255.255.255:21/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
diff --git a/LayoutTests/security/block-test.html b/LayoutTests/security/block-test.html
index 66a7952..9214c49 100644
--- a/LayoutTests/security/block-test.html
+++ b/LayoutTests/security/block-test.html
@@ -5,7 +5,8 @@
       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, 3659, 4045, 6000, 0);
+      540, 556, 563, 587, 601, 636, 993, 995, 2049, 3659, 4045, 
+      6000, 6665, 6666, 6667, 6668, 6669, 0);
     
     var baseURL = "255.255.255.255";
     var currentPort = 0;
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e9b931e..09c4e3d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-01  Brady Eidson  <beidson at apple.com>
+
+        Reviewed by Tim Hatcher.
+
+        Add common IRC ports to port blocking.
+        <rdar://problem/7593895> and https://bugs.webkit.org/show_bug.cgi?id=34451
+
+        * platform/KURL.cpp:
+        (WebCore::portAllowed):
+
 2010-01-29  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Nate Chapin.
diff --git a/WebCore/platform/KURL.cpp b/WebCore/platform/KURL.cpp
index 9783bd8..b059c44 100644
--- a/WebCore/platform/KURL.cpp
+++ b/WebCore/platform/KURL.cpp
@@ -1752,6 +1752,12 @@ bool portAllowed(const KURL& url)
         3659, // apple-sasl / PasswordServer [Apple addition]
         4045, // lockd
         6000, // X11
+        6665, // Alternate IRC [Apple addition]
+        6666, // Alternate IRC [Apple addition]
+        6667, // Standard IRC [Apple addition]
+        6668, // Alternate IRC [Apple addition]
+        6669, // Alternate IRC [Apple addition]
+
     };
     const unsigned short* const blockedPortListEnd = blockedPortList + sizeof(blockedPortList) / sizeof(blockedPortList[0]);
 

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list