[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[commit-queue at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 2afb3bae5f486bae94dda1657dd4699166f0d78a
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 24 22:22:42 2011 +0000

    2011-01-24  Xianzhu Wang  <wangxianzhu at google.com>
    
            Reviewed by Tony Chang.
    
            new-run-webkit-tests fails to start HTTP server if there are proxy settings
            https://bugs.webkit.org/show_bug.cgi?id=52872
    
            Force disabling proxy to resolve the problem.
    
            * Scripts/webkitpy/layout_tests/port/http_server_base.py:
            * Scripts/webkitpy/layout_tests/port/websocket_server.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76547 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 20b0539..20a028c 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-24  Xianzhu Wang  <wangxianzhu at google.com>
+
+        Reviewed by Tony Chang.
+
+        new-run-webkit-tests fails to start HTTP server if there are proxy settings
+        https://bugs.webkit.org/show_bug.cgi?id=52872
+
+        Force disabling proxy to resolve the problem.
+
+        * Scripts/webkitpy/layout_tests/port/http_server_base.py:
+        * Scripts/webkitpy/layout_tests/port/websocket_server.py:
+
 2011-01-24  Andreas Kling  <kling at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/http_server_base.py b/Tools/Scripts/webkitpy/layout_tests/port/http_server_base.py
index 52a0403..2a43e81 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/http_server_base.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/http_server_base.py
@@ -67,7 +67,7 @@ class HttpServerBase(object):
             url = 'http%s://127.0.0.1:%d/' % (http_suffix, mapping['port'])
 
             try:
-                response = urllib.urlopen(url)
+                response = urllib.urlopen(url, proxies={})
                 _log.debug("Server running at %s" % url)
             except IOError, e:
                 _log.debug("Server NOT running at %s: %s" % (url, e))
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/websocket_server.py b/Tools/Scripts/webkitpy/layout_tests/port/websocket_server.py
index 926bc04..713ad21 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/websocket_server.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/websocket_server.py
@@ -73,7 +73,7 @@ def url_is_alive(url):
     wait_time = 10
     while wait_time > 0:
         try:
-            response = urllib.urlopen(url)
+            response = urllib.urlopen(url, proxies={})
             # Server is up and responding.
             return True
         except IOError:

-- 
WebKit Debian packaging