diff --git a/VERSION b/VERSION
index eac35f14..c7b4727a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.0 (2012-10-10 11:25:21) dev
+Version 2.1.0 (2012-10-10 11:43:02) dev
diff --git a/gluon/main.py b/gluon/main.py
index 89cc2d9c..a06e0c73 100644
--- a/gluon/main.py
+++ b/gluon/main.py
@@ -426,18 +426,19 @@ def wsgibase(environ, responder):
                 app = request.application ## must go after url_in!
 
                 http_host = env.http_host.split(':',1)[0]
-                local_hosts = [http_host,'::1','127.0.0.1',
-                               '::ffff:127.0.0.1']
-                if not global_settings.web2py_runtime_gae:
-                    try:
-                        local_hosts.append(socket.gethostname())
-                    except TypeError:
-                        pass
-                    try:
-                        local_hosts.append(
-                            socket.gethostbyname(http_host))
-                    except (socket.gaierror,TypeError):
-                        pass
+                if not global_settings.local_hosts:
+                    local_hosts = ['127.0.0.1','::ffff:127.0.0.1']
+                    if not global_settings.web2py_runtime_gae:
+                        try:
+                            local_hosts.append(socket.gethostname())
+                        except TypeError:
+                            pass
+                        try:
+                            local_hosts.append(socket.gethostbyname(http_host))
+                        except (socket.gaierror,TypeError):
+                            pass
+                        global_settings.local_hosts = local_hosts
+                local_hosts = global_settings.local_hosts + [http_host]
                 client = get_client(env)
                 x_req_with = str(env.http_x_requested_with).lower()
                 
diff --git a/gluon/settings.py b/gluon/settings.py
index a8d23280..504bc1fd 100644
--- a/gluon/settings.py
+++ b/gluon/settings.py
@@ -6,6 +6,7 @@ License: LGPLv3 (http://www.gnu.org/licenses/lgpl.html)
 
 import os
 import sys
+import socket
 import platform
 from storage import Storage
 
@@ -37,4 +38,3 @@ global_settings.is_jython = \
     str(sys.copyright).find('Jython') > 0
 
 
-