summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Resch <andrewresch@gmail.com>2008-10-08 13:32:02 +0000
committerAndrew Resch <andrewresch@gmail.com>2008-10-08 13:32:02 +0000
commit798b27cf34f5a299b2bc7261e796e89ba6ee39ca (patch)
tree9307a488f70085b5b39d3c5bf9273507009dc450
parentacd64e6381a43a8bcc0477279d453ea2a352f902 (diff)
downloaddeluge-798b27cf34f5a299b2bc7261e796e89ba6ee39ca.tar.gz
deluge-798b27cf34f5a299b2bc7261e796e89ba6ee39ca.tar.bz2
deluge-798b27cf34f5a299b2bc7261e796e89ba6ee39ca.zip
Fix freezing on start-up issues on systems that do not have a properly
configured localhost entry.
-rw-r--r--ChangeLog2
-rw-r--r--deluge/core/core.py2
-rw-r--r--deluge/ui/gtkui/connectionmanager.py2
3 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index afd4df43c..6ee6cf0c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ Deluge 1.0.1 (In Development)
* Changed max half-open connections default limit to 8 on XP/2000 and 4 on Vista
* Prevent being able to set file priorities for compactly allocated torrents as
it is not intended to work.
+ * Fix freezing on start-up issues on systems that do not have a properly
+ configured localhost entry.
GtkUI:
* Improve performance of files tab by only updating when values change
diff --git a/deluge/core/core.py b/deluge/core/core.py
index 59945724e..395a47bfc 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -132,7 +132,7 @@ class Core(
if self.config["allow_remote"]:
hostname = ""
else:
- hostname = "localhost"
+ hostname = "127.0.0.1"
# Setup the xmlrpc server
try:
diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py
index 95b446486..0ad480375 100644
--- a/deluge/ui/gtkui/connectionmanager.py
+++ b/deluge/ui/gtkui/connectionmanager.py
@@ -333,7 +333,7 @@ class ConnectionManager(component.Component):
online = True
host = None
try:
- host = xmlrpclib.ServerProxy(uri)
+ host = xmlrpclib.ServerProxy(uri.replace("localhost", "127.0.0.1"))
host.ping()
except socket.error:
online = False