From 6cd03c57b9589000867aa89289008bbf74f989cb Mon Sep 17 00:00:00 2001 From: "rpotts%netscape.com" Date: Tue, 22 Sep 1998 07:02:20 +0000 Subject: [PATCH] Move DNS initialization out to when Netlib is initialized. This ensures that the initialization takes place on the Netlib Thread. git-svn-id: svn://10.0.0.236/trunk@10686 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/network/main/win-dns.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/mozilla/network/main/win-dns.cpp b/mozilla/network/main/win-dns.cpp index bbae9a123db..6f52ffe9ffd 100644 --- a/mozilla/network/main/win-dns.cpp +++ b/mozilla/network/main/win-dns.cpp @@ -179,8 +179,7 @@ EventProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return DefWindowProc(hwnd, uMsg, wParam, lParam); } -static PRBool -OneTimeInit() +void net_InitAsyncDNS() { static char *windowClass = "NETLIB:DNSWindow"; @@ -215,8 +214,6 @@ OneTimeInit() DNS_TRACE(DNS_TRACE_LOOKUPS, ("DNS lookup: hidden window=%p msg=%d", gDNSWindow, gMSGFoundDNS)); - - return NULL != gDNSWindow; } extern "C" int @@ -231,12 +228,10 @@ NET_AsyncDNSLookup(void* aContext, PRHostEnt** aHoststructPtrPtr, PRFileDesc* aSocket) { - static PRBool firstTime = PR_TRUE; - if (firstTime) { - firstTime = PR_FALSE; - if (!OneTimeInit()) { - return -1; - } + /* DNS initialization failed... */ + if (NULL == gDNSWindow) { + PR_ASSERT(0); + return -1; } *aHoststructPtrPtr = NULL;