5 files changed, 9 insertions, 9 deletions
diff --git a/cpp/config/glacier2router.cfg b/cpp/config/glacier2router.cfg
index a56bf3f1009..ff529a5038c 100644
--- a/cpp/config/glacier2router.cfg
+++ b/cpp/config/glacier2router.cfg
@@ -16,8 +16,8 @@ Glacier2.InstanceName=DemoGlacier2Router
 # - 4063 (insecure)
 # - 4064 (secure, using SSL)
 #
-Glacier2.Client.Endpoints=tcp -p 4063 -h 127.0.0.1
-#Glacier2.Client.Endpoints=ssl -p 4064 -h 127.0.0.1
+Glacier2.Client.Endpoints=tcp -p 4063 -h localhost
+#Glacier2.Client.Endpoints=ssl -p 4064 -h localhost
 
 #
 # The server-visible endpoint of Glacier2. This endpoint is only
@@ -26,7 +26,7 @@ Glacier2.Client.Endpoints=tcp -p 4063 -h 127.0.0.1
 # on the loopback, so that the server is not directly accessible from
 # the Internet.
 #
-Glacier2.Server.Endpoints=tcp -h 127.0.0.1
+Glacier2.Server.Endpoints=tcp -h localhost
 
 #  
 # This permissions verifier allows any user-id / password combination;
diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp
index efacc6e7727..bc3d471aa37 100644
--- a/cpp/src/Glacier2Lib/SessionHelper.cpp
+++ b/cpp/src/Glacier2Lib/SessionHelper.cpp
@@ -794,7 +794,7 @@ SessionHelperI::dispatchCallbackAndWait(const Ice::DispatcherCallPtr& call, cons
 }
 
 Glacier2::SessionFactoryHelper::SessionFactoryHelper(const SessionCallbackPtr& callback) :
-    _routerHost("127.0.0.1"),
+    _routerHost("localhost"),
     _secure(true),
     _port(0),
     _timeout(10000),
@@ -808,7 +808,7 @@ Glacier2::SessionFactoryHelper::SessionFactoryHelper(const SessionCallbackPtr& c
 
 Glacier2::SessionFactoryHelper::SessionFactoryHelper(const Ice::InitializationData& initData,
                                            const SessionCallbackPtr& callback) :
-    _routerHost("127.0.0.1"),
+    _routerHost("localhost"),
     _secure(true),
     _port(0),
     _timeout(10000),
@@ -825,7 +825,7 @@ Glacier2::SessionFactoryHelper::SessionFactoryHelper(const Ice::InitializationDa
 }
 
 Glacier2::SessionFactoryHelper::SessionFactoryHelper(const Ice::PropertiesPtr& properties, const SessionCallbackPtr& callback) :
-    _routerHost("127.0.0.1"),
+    _routerHost("localhost"),
     _secure(true),
     _port(0),
     _timeout(10000),
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp
index 10f51510da8..7c61652388a 100644
--- a/cpp/src/IceGrid/NodeCache.cpp
+++ b/cpp/src/IceGrid/NodeCache.cpp
@@ -932,7 +932,7 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& info) const
         }
         else
         {
-            props.push_back(createProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1"));
+            props.push_back(createProperty("Ice.Admin.Endpoints", "tcp -h localhost"));
             server->processRegistered = true;
         }
     }
diff --git a/cs/src/Glacier2/SessionFactoryHelper.cs b/cs/src/Glacier2/SessionFactoryHelper.cs
index fe70ad8318e..dc23b5b9cc4 100644
--- a/cs/src/Glacier2/SessionFactoryHelper.cs
+++ b/cs/src/Glacier2/SessionFactoryHelper.cs
@@ -329,7 +329,7 @@ public class SessionFactoryHelper
     }
 
     private SessionCallback _callback;
-    private string _routerHost = "127.0.0.1";
+    private string _routerHost = "localhost";
     private Ice.InitializationData _initData;
     private Ice.Identity _identity = new Ice.Identity("router", "Glacier2");
     private bool _secure = true;
diff --git a/java/src/Glacier2/SessionFactoryHelper.java b/java/src/Glacier2/SessionFactoryHelper.java
index 559aacffd5c..109f636d1dc 100644
--- a/java/src/Glacier2/SessionFactoryHelper.java
+++ b/java/src/Glacier2/SessionFactoryHelper.java
@@ -321,7 +321,7 @@ public class SessionFactoryHelper
     }
 
     private SessionCallback _callback;
-    private String _routerHost = "127.0.0.1";
+    private String _routerHost = "localhost";
     private Ice.InitializationData _initData;
     private Ice.Identity _identity = new Ice.Identity("router", "Glacier2");
     private boolean _secure = true;