diff --git a/netwerk/dns/src/nsDNSService2.cpp b/netwerk/dns/src/nsDNSService2.cpp
index d75e702910ef..aa95184b5baa 100644
--- a/netwerk/dns/src/nsDNSService2.cpp
+++ b/netwerk/dns/src/nsDNSService2.cpp
@@ -279,7 +279,7 @@ nsDNSService::Init()
 
     // prefs
     PRUint32 maxCacheEntries  = 20;
-    PRUint32 maxCacheLifetime = 5; // minutes
+    PRUint32 maxCacheLifetime = 1; // minutes
     PRBool   enableIDN        = PR_TRUE;
 
     // read prefs
diff --git a/netwerk/dns/src/nsHostResolver.cpp b/netwerk/dns/src/nsHostResolver.cpp
index 5934b44b559f..5f55888a78f1 100644
--- a/netwerk/dns/src/nsHostResolver.cpp
+++ b/netwerk/dns/src/nsHostResolver.cpp
@@ -63,7 +63,7 @@
 //----------------------------------------------------------------------------
 
 #define MAX_THREADS 8
-#define IDLE_TIMEOUT PR_SecondsToInterval(5)
+#define IDLE_TIMEOUT PR_SecondsToInterval(60)
 
 //----------------------------------------------------------------------------
 
@@ -226,11 +226,13 @@ HostDB_ClearEntry(PLDHashTable *table,
         void *iter = nsnull;
         PRNetAddr addr;
         char buf[64];
-        do {
+        for (;;) {
             iter = PR_EnumerateAddrInfo(iter, he->rec->addrinfo, 0, &addr);
+            if (!iter)
+                break;
             PR_NetAddrToString(&addr, buf, sizeof(buf));
             LOG(("  %s\n", buf));
-        } while (iter);
+        }
     }
 #endif
     NS_RELEASE(he->rec);