[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[kov at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 5a808b6cb3414b3fa23cc9c8056655d3aeca6449
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 8 14:23:29 2010 +0000

    LayoutTests
    
    2010-03-08  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Reviewed by Holger Freyther.
    
            [GTK] Tests fail when running with ipv6 addresses available, on Debian systems
            https://bugs.webkit.org/show_bug.cgi?id=35863
    
            Also listen for SSL requests on the ipv6 address.
    
            * http/conf/apache2-debian-httpd.conf:
    
    WebKitTools
    
    2010-03-08  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Reviewed by Holger Freyther.
    
            [GTK] Tests fail when running with ipv6 addresses available, on Debian systems
            https://bugs.webkit.org/show_bug.cgi?id=35863
    
            If running on a Debian-based system, also listen on the ipv6 address.
    
            * Scripts/run-webkit-tests:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55662 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 477eebc..a18f8fa 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,16 @@
 2010-03-08  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
+        Reviewed by Holger Freyther.
+
+        [GTK] Tests fail when running with ipv6 addresses available, on Debian systems
+        https://bugs.webkit.org/show_bug.cgi?id=35863
+
+        Also listen for SSL requests on the ipv6 address.
+
+        * http/conf/apache2-debian-httpd.conf:
+
+2010-03-08  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
         [GTK] DRT needs to support synthesizing double clicks
         https://bugs.webkit.org/show_bug.cgi?id=35862
 
diff --git a/LayoutTests/http/conf/apache2-debian-httpd.conf b/LayoutTests/http/conf/apache2-debian-httpd.conf
index 03aa9c8..da725f1 100644
--- a/LayoutTests/http/conf/apache2-debian-httpd.conf
+++ b/LayoutTests/http/conf/apache2-debian-httpd.conf
@@ -159,10 +159,13 @@ MaxRequestsPerChild 100000
 #
 # Configured from the httpd command line for WebKit layout tests.
 # Port 8443 is hard-coded as it is needed for the HTTPS configuration later on.
+# The IPV6 address is needed because Debian resolves ipv6 address
+# first, and libsoup may only try the first address.
 #
 #Listen 3000
 Listen 127.0.0.1:8080
 Listen 127.0.0.1:8443
+Listen [::1]:8443
 
 #
 # Dynamic Shared Object (DSO) Support
@@ -675,3 +678,8 @@ ServerSignature On
     ServerName 127.0.0.1
     SSLEngine On
 </VirtualHost>
+
+<VirtualHost [::1]:8443>
+    ServerName 127.0.0.1
+    SSLEngine On
+</VirtualHost>
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3dc4700..0f35ede 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-08  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Reviewed by Holger Freyther.
+
+        [GTK] Tests fail when running with ipv6 addresses available, on Debian systems
+        https://bugs.webkit.org/show_bug.cgi?id=35863
+
+        If running on a Debian-based system, also listen on the ipv6 address.
+
+        * Scripts/run-webkit-tests:
+
 2010-03-08  Holger Hans Peter Freyther  <zecke at selfish.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index 2e41489..84ca3b0 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -1403,6 +1403,14 @@ sub configureAndOpenHTTPDIfNeeded()
         "-C", "Listen $listen"
     );
 
+    # Debian, and Debian-based distributions resolve IPV6 addresses first,
+    # and libsoup only tries the first address given to it
+    if (isDebianBased()) {
+        my $listenIPV6 = "[::1]:$httpdPort";
+        push(@args, "-C");
+        push(@args, "Listen $listenIPV6");
+    }
+
     my @defaultArgs = getDefaultConfigForTestDirectory($testDirectory);
     @args = (@defaultArgs, @args);
 

-- 
WebKit Debian packaging