diff --git a/mozilla/netwerk/build/nsNetCID.h b/mozilla/netwerk/build/nsNetCID.h
index a60de042418..34cf44e8f76 100644
--- a/mozilla/netwerk/build/nsNetCID.h
+++ b/mozilla/netwerk/build/nsNetCID.h
@@ -398,9 +398,17 @@
* netwerk/dns/ classes
*/
+#define NS_IDNSERVICE_CLASSNAME \
+ "nsIDNService"
/* ContractID of the XPCOM package that implements nsIIDNService */
#define NS_IDNSERVICE_CONTRACTID \
- "@i-dns.net/IDNService;1"
-
+ "@mozilla.org/network/idn-service;1"
+#define NS_IDNSERVICE_CID \
+{ /* 62b778a6-bce3-456b-8c31-2865fbb68c91 */ \
+ 0x62b778a6, \
+ 0xbce3, \
+ 0x456b, \
+ {0x8c, 0x31, 0x28, 0x65, 0xfb, 0xb6, 0x8c, 0x91} \
+}
#endif // nsNetCID_h__
diff --git a/mozilla/netwerk/build/nsNetModule.cpp b/mozilla/netwerk/build/nsNetModule.cpp
index 633c9fe1bf9..ec54470f13d 100644
--- a/mozilla/netwerk/build/nsNetModule.cpp
+++ b/mozilla/netwerk/build/nsNetModule.cpp
@@ -148,6 +148,11 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsResumableEntityID)
///////////////////////////////////////////////////////////////////////////////
+#include "nsIDNService.h"
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsIDNService)
+
+///////////////////////////////////////////////////////////////////////////////
+
#include "nsFileChannel.h"
#include "nsFileProtocolHandler.h"
#include "nsDataHandler.h"
@@ -516,6 +521,10 @@ static const nsModuleComponentInfo gNetModuleInfo[] = {
NS_DNSSERVICE_CID,
"@mozilla.org/network/dns-service;1",
nsDNSService::Create },
+ { NS_IDNSERVICE_CLASSNAME,
+ NS_IDNSERVICE_CID,
+ NS_IDNSERVICE_CONTRACTID,
+ nsIDNServiceConstructor },
{ NS_SIMPLEURI_CLASSNAME,
NS_SIMPLEURI_CID,
NS_SIMPLEURI_CONTRACTID,
diff --git a/mozilla/netwerk/dns/src/Makefile.in b/mozilla/netwerk/dns/src/Makefile.in
index de403e15cb8..323fe88f006 100644
--- a/mozilla/netwerk/dns/src/Makefile.in
+++ b/mozilla/netwerk/dns/src/Makefile.in
@@ -33,7 +33,8 @@ REQUIRES = xpcom \
pref \
$(NULL)
-CPPSRCS = nsDnsService.cpp
+CPPSRCS = nsDnsService.cpp \
+ nsIDNService.cpp
# we don't want the shared lib, but we want to force the creation of a
diff --git a/mozilla/netwerk/macbuild/netwerk.xml b/mozilla/netwerk/macbuild/netwerk.xml
index 573a317239f..bdb595f2290 100644
--- a/mozilla/netwerk/macbuild/netwerk.xml
+++ b/mozilla/netwerk/macbuild/netwerk.xml
@@ -1709,6 +1709,13 @@
Text
Debug
+
+ Name
+ nsIDNService.cpp
+ MacOS
+ Text
+ Debug
+
@@ -2241,6 +2248,11 @@
nsMemoryCacheDevice.cpp
MacOS
+
+ Name
+ nsIDNService.cpp
+ MacOS
+
@@ -3899,6 +3911,13 @@
Text
Debug
+
+ Name
+ nsIDNService.cpp
+ MacOS
+ Text
+ Debug
+
@@ -4431,6 +4450,11 @@
nsMemoryCacheDevice.cpp
MacOS
+
+ Name
+ nsIDNService.cpp
+ MacOS
+
@@ -6075,6 +6099,13 @@
Text
Debug
+
+ Name
+ nsIDNService.cpp
+ MacOS
+ Text
+ Debug
+
@@ -6597,6 +6628,11 @@
nsMemoryCacheDevice.cpp
MacOS
+
+ Name
+ nsIDNService.cpp
+ MacOS
+
@@ -8241,6 +8277,13 @@
Text
Debug
+
+ Name
+ nsIDNService.cpp
+ MacOS
+ Text
+ Debug
+
@@ -8763,6 +8806,11 @@
nsMemoryCacheDevice.cpp
MacOS
+
+ Name
+ nsIDNService.cpp
+ MacOS
+
@@ -8984,6 +9032,12 @@
nsDnsService.cpp
MacOS
+
+ Necko.shlb
+ Name
+ nsIDNService.cpp
+ MacOS
+
mime