[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 4cae1e3384e366b368d9a545cb09908aadf029f4
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 8 15:07:21 2010 +0000

    2010-03-08  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            No review, rolling out r55662.
            http://trac.webkit.org/changeset/55662
            https://bugs.webkit.org/show_bug.cgi?id=35863
    
            Need to be coordinated with bots setup
    
            * http/conf/apache2-debian-httpd.conf:
    2010-03-08  Gustavo Noronha Silva  <gns at gnome.org>
    
            No review, rolling out r55662.
            http://trac.webkit.org/changeset/55662
            https://bugs.webkit.org/show_bug.cgi?id=35863
    
            Need to be coordinated with bots setup
    
            * Scripts/run-webkit-tests:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55663 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a18f8fa..28804f2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,15 @@
 2010-03-08  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
+        No review, rolling out r55662.
+        http://trac.webkit.org/changeset/55662
+        https://bugs.webkit.org/show_bug.cgi?id=35863
+
+        Need to be coordinated with bots setup
+
+        * http/conf/apache2-debian-httpd.conf:
+
+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
diff --git a/LayoutTests/http/conf/apache2-debian-httpd.conf b/LayoutTests/http/conf/apache2-debian-httpd.conf
index da725f1..03aa9c8 100644
--- a/LayoutTests/http/conf/apache2-debian-httpd.conf
+++ b/LayoutTests/http/conf/apache2-debian-httpd.conf
@@ -159,13 +159,10 @@ 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
@@ -678,8 +675,3 @@ 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 0f35ede..0f36cd1 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-08  Gustavo Noronha Silva  <gns at gnome.org>
+
+        No review, rolling out r55662.
+        http://trac.webkit.org/changeset/55662
+        https://bugs.webkit.org/show_bug.cgi?id=35863
+
+        Need to be coordinated with bots setup
+
+        * Scripts/run-webkit-tests:
+
 2010-03-08  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Holger Freyther.
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index 84ca3b0..2e41489 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -1403,14 +1403,6 @@ 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