Landing no_neckoutil2_branch. Bug #11159. Removes neckoutil_s.lib from build which helps beos and openvms.

git-svn-id: svn://10.0.0.236/trunk@54722 18797224-902f-48f8-a5cc-f745e15eee43
1999-11-30 04:50:42 +00:00 · 1999-11-30 04:50:42 +00:00 · 51881fbcea
commit 51881fbcea
parent 99fb5a522a
200 changed files with 570 additions and 786 deletions
--- a/mozilla/chrome/src/nsChromeRegistry.cpp
+++ b/mozilla/chrome/src/nsChromeRegistry.cpp
@ -39,7 +39,7 @@
 #include "nsString.h"
 #include "nsXPIDLString.h"
 #include "nsISimpleEnumerator.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsFileLocations.h"
 #include "nsIFileLocator.h"
 #include "nsIDOMWindow.h"
--- a/mozilla/config/autoconf.mk.in
+++ b/mozilla/config/autoconf.mk.in
@ -35,7 +35,6 @@ USE_NSPR_AUTOCONF = @USE_NSPR_AUTOCONF@
 ### XXX ### BROKEN MOZ_USING_XLIBRGB = @MOZ_USING_XLIBRGB@

 MOZ_TIMER_LIBS             = @MOZ_TIMER_LIBS@
-MOZ_NECKO_UTIL_LIBS        = $(DIST)/lib/libneckoutil_s.a
 MOZ_REGISTRY_LIBS          = $(DIST)/lib/libmozreg_s.a
 MOZ_WIDGET_SUPPORT_LIBS    = $(DIST)/lib/libwidgetsupport_s.a

--- a/mozilla/content/base/src/nsGenericElement.cpp
+++ b/mozilla/content/base/src/nsGenericElement.cpp
@ -40,7 +40,7 @@
 #include "nsISizeOfHandler.h"
 #include "nsISupportsArray.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsFrame.h"
 #include "nsIPresShell.h"
 #include "nsIView.h"
--- a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
@ -47,7 +47,7 @@
 #include "nsIStyleRule.h"
 #include "nsISupportsArray.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsStyleConsts.h"
 #include "nsXIFConverter.h"
 #include "nsFrame.h"
--- a/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp
@ -36,7 +36,7 @@

 #include "nsIEventStateManager.h"
 #include "nsDOMEvent.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"

 #include "nsCOMPtr.h"
 #include "nsIFrameManager.h"
--- a/mozilla/content/html/content/src/nsHTMLImageElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLImageElement.cpp
@ -44,7 +44,7 @@
 #include "nsIIOService.h"
 #include "nsIURL.h"
 #include "nsIServiceManager.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);

 // XXX nav attrs: suppress
--- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
@ -28,7 +28,7 @@
 #include "nsIHTMLContentContainer.h"
 #include "nsIURL.h"
 #include "nsIUnicharStreamLoader.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIPresShell.h"
 #include "nsIPresContext.h"
 #include "nsIViewManager.h"
@ -1940,7 +1940,10 @@ HTMLContentSink::~HTMLContentSink()
  }
 }

-NS_IMPL_ISUPPORTS2(HTMLContentSink, nsIHTMLContentSink, nsIUnicharStreamLoaderObserver)
+NS_IMPL_ISUPPORTS3(HTMLContentSink, 
+                   nsIHTMLContentSink,
+                   nsIContentSink,
+                   nsIUnicharStreamLoaderObserver)

 nsresult
 HTMLContentSink::Init(nsIDocument* aDoc,
@ -3634,10 +3637,11 @@ HTMLContentSink::EvaluateScript(nsString& aScript,
 NS_IMETHODIMP
 HTMLContentSink::OnUnicharStreamComplete(nsIUnicharStreamLoader* aLoader,
                                         nsresult aStatus,
+                                         PRUint32 stringLen,
                                         const PRUnichar* string)
 {
  nsresult rv = NS_OK;
-  nsString aData(string);
+  nsString aData(string, stringLen);

  if (NS_OK == aStatus) {
    PRBool bodyPresent = PreEvaluateScript();
--- a/mozilla/content/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp
@ -48,7 +48,7 @@
 #include "nsIURL.h"
 #include "nsIIOService.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIContentViewerContainer.h"
 #include "nsIContentViewer.h"
 #include "nsIMarkupDocumentViewer.h"
--- a/mozilla/content/html/style/src/nsCSSLoader.cpp
+++ b/mozilla/content/html/style/src/nsCSSLoader.cpp
@ -37,7 +37,7 @@
 #include "nsIURL.h"
 #include "nsIURL.h"
 #include "nsIServiceManager.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsCRT.h"
 #include "nsVoidArray.h"
 #include "nsISupportsArray.h"
@ -593,9 +593,10 @@ CSSLoaderImpl::RecycleParser(nsICSSParser* aParser)
 NS_IMETHODIMP
 SheetLoadData::OnUnicharStreamComplete(nsIUnicharStreamLoader* aLoader,
                                       nsresult aStatus,
+                                       PRUint32 stringLen,
                                       const PRUnichar* string)
 {
-  nsString aStyleData(string);
+  nsString aStyleData(string, stringLen);
  mLoader->DidLoadStyle(aLoader, aStyleData, this, aStatus);

  // We added a reference when the loader was created. This
--- a/mozilla/content/html/style/src/nsCSSParser.cpp
+++ b/mozilla/content/html/style/src/nsCSSParser.cpp
@ -35,7 +35,7 @@
 #include "nsICSSDeclaration.h"
 #include "nsStyleConsts.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsIAtom.h"
--- a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
+++ b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
@ -28,7 +28,7 @@
 #include "nsIIOService.h"
 #include "nsIURL.h"
 #include "nsIServiceManager.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 #include "nsISupportsArray.h"
 #include "nsHashtable.h"
--- a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
+++ b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
@ -28,7 +28,7 @@
 #include "nsIIOService.h"
 #include "nsIURL.h"
 #include "nsIServiceManager.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 #include "nsISupportsArray.h"
 #include "nsHashtable.h"
--- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp
+++ b/mozilla/content/xml/document/src/nsXMLContentSink.cpp
@ -30,7 +30,7 @@
 #include "nsIScriptObjectOwner.h"
 #include "nsIURL.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIWebShell.h"
 #include "nsIContent.h"
 #include "nsITextContent.h"
@ -1714,10 +1714,11 @@ IsJavaScriptLanguage(const nsString& aName, const char* *aVersion)
 NS_IMETHODIMP
 nsXMLContentSink::OnUnicharStreamComplete(nsIUnicharStreamLoader* aLoader,
                                          nsresult aStatus,
+                                          PRUint32 stringLen,
                                          const PRUnichar* string)
 {
  nsresult rv = NS_OK;
-  nsString aData(string);
+  nsString aData(string, stringLen);

  if (NS_OK == aStatus) {
    rv = EvaluateScript(aData, 0, mScriptLanguageVersion);
--- a/mozilla/content/xul/document/src/nsXULContentSink.cpp
+++ b/mozilla/content/xul/document/src/nsXULContentSink.cpp
@ -74,7 +74,7 @@
 #include "nsIXULPrototypeDocument.h"
 #include "nsIXULPrototypeCache.h"
 #include "nsLayoutCID.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsRDFCID.h"
 #include "nsRDFParserUtils.h"
 #include "nsVoidArray.h"
--- a/mozilla/content/xul/document/src/nsXULDocument.cpp
+++ b/mozilla/content/xul/document/src/nsXULDocument.cpp
@ -105,7 +105,7 @@
 #include "nsIXULPrototypeCache.h"
 #include "nsLWBrkCIID.h"
 #include "nsLayoutCID.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsParserCIID.h"
 #include "nsRDFCID.h"
 #include "nsRDFDOMNodeList.h"
@ -4828,9 +4828,10 @@ nsXULDocument::LoadScript(nsXULPrototypeScript* aScriptProto, PRBool* aBlock)
 }


-nsresult
+NS_IMETHODIMP
 nsXULDocument::OnUnicharStreamComplete(nsIUnicharStreamLoader* aLoader,
                                       nsresult aStatus,
+                                       PRUint32 stringLen,
                                       const PRUnichar* string)
 {
    // This is the completion routine that will be called when a
@ -4854,8 +4855,7 @@ nsXULDocument::OnUnicharStreamComplete(nsIUnicharStreamLoader* aLoader,
    scriptProto->mSrcLoading = PR_FALSE;

    if (NS_SUCCEEDED(aStatus)) {
-        // XXXbe bug warren to provide string length from caller too
-        rv = scriptProto->Compile(string, nsCRT::strlen(string),
+        rv = scriptProto->Compile(string, stringLen,
                                  scriptProto->mSrcURI, 1,
                                  this);
        aStatus = rv;
--- a/mozilla/content/xul/templates/src/nsXULContentUtils.cpp
+++ b/mozilla/content/xul/templates/src/nsXULContentUtils.cpp
@ -55,7 +55,7 @@
 #include "nsIXULContentUtils.h"
 #include "nsIXULPrototypeCache.h"
 #include "nsLayoutCID.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsRDFCID.h"
 #include "nsString.h"
 #include "nsXPIDLString.h"
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@ -30,7 +30,7 @@
 #include "nsIDeviceContext.h"
 #include "nsCURILoader.h"
 #include "nsLayoutCID.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsRect.h"
 #include "prprf.h"
 #include "nsIFrame.h"
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@ -30,7 +30,7 @@
 #include "nsILinkHandler.h"
 #include "nsIStreamListener.h"
 #include "nsIPrompt.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIProtocolHandler.h"
 #include "nsIDNSService.h"
 #include "nsIRefreshURI.h"
--- a/mozilla/dom/src/base/nsGlobalWindow.cpp
+++ b/mozilla/dom/src/base/nsGlobalWindow.cpp
@ -75,7 +75,7 @@
 #include "nsIJSContextStack.h"
 #include "nsIIOService.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsRDFCID.h"
 #include "nsDOMPropEnums.h"
 #include "nsXPIDLString.h"
--- a/mozilla/dom/src/base/nsLocation.cpp
+++ b/mozilla/dom/src/base/nsLocation.cpp
@ -26,7 +26,7 @@
 #include "nsIIOService.h"
 #include "nsIURL.h"
 #include "nsIServiceManager.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 #include "plstr.h"
 #include "prmem.h"
--- a/mozilla/dom/src/build/Makefile.in
+++ b/mozilla/dom/src/build/Makefile.in
@ -51,7 +51,6 @@ EXTRA_DSO_LDOPTS = \
 		$(MKSHLIB_FORCE_ALL) \
 		$(SHARED_LIBRARY_LIBS) \
 		$(MKSHLIB_UNFORCE_ALL) \
-		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		-lmozjs \
--- a/mozilla/dom/src/build/makefile.win
+++ b/mozilla/dom/src/build/makefile.win
@ -53,11 +53,6 @@ LLIBS=							\
 	$(DIST)\lib\jsdomhtml_s.lib			\
 	$(DIST)\lib\jsdomcss_s.lib			\
 	$(DIST)\lib\gkgfxwin.lib			\
-!ifdef NECKO
-	$(DIST)\lib\neckoutil_s.lib			\
-!else
-	$(DIST)\lib\netlib.lib				\
-!endif
 	$(DIST)\lib\js32$(VERSION_NUMBER).lib		\
 	$(DIST)\lib\xpcom.lib				\
 	$(DIST)\lib\plds3.lib				\
--- a/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp
+++ b/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp
@ -26,7 +26,7 @@
 #include "nsIComponentManager.h"
 #include "nsIGenericFactory.h"
 #include "nsIServiceManager.h"
-#include "nsIIOService.h"
+#include "nsNetUtil.h"
 #include "nsIInputStream.h"
 #include "nsIStringStream.h"
 #include "nsIURI.h"
@ -329,13 +329,6 @@ nsJSProtocolHandler::NewChannel(const char* verb,
    }
 #endif

-    NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
-    if (NS_FAILED(rv)) {
-        if (retString)
-            Recycle(retString);
-        return rv;
-    }
-
    nsCOMPtr<nsISupports> s;
    rv = NS_NewStringInputStream(getter_AddRefs(s), retString);
    int length = PL_strlen(retString);
@ -349,10 +342,10 @@ nsJSProtocolHandler::NewChannel(const char* verb,

    nsIChannel* channel;

-    rv = serv->NewInputStreamChannel(uri, "text/html", length,
-                                     in, aLoadGroup,
-                                     notificationCallbacks, loadAttributes,
-                                     originalURI, &channel);
+    rv = NS_NewInputStreamChannel(uri, "text/html", length,
+                                  in, aLoadGroup,
+                                  notificationCallbacks, loadAttributes,
+                                  originalURI, &channel);
    if (NS_FAILED(rv))
        return rv;

--- a/mozilla/editor/base/makefile.win
+++ b/mozilla/editor/base/makefile.win
@ -128,11 +128,6 @@ LLIBS=				\
 $(DIST)\lib\js3250.lib	\
 $(DIST)\lib\gkparser.lib		\
 $(DIST)\lib\raptorwidget_s.lib		\
-!ifdef NECKO
- $(DIST)\lib\neckoutil_s.lib           \
-!else
- $(DIST)\lib\netlib.lib           \
-!endif
 $(LIBNSPR)  
 !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
 LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
--- a/mozilla/editor/base/nsEditor.cpp
+++ b/mozilla/editor/base/nsEditor.cpp
@ -63,7 +63,7 @@
 #include "nsIStringStream.h"
 #include "nsITextContent.h"

-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"

 #include "nsIContent.h"
 #include "nsIContentIterator.h"
--- a/mozilla/editor/base/nsEditorShell.cpp
+++ b/mozilla/editor/base/nsEditorShell.cpp
@ -46,7 +46,7 @@
 #include "nsIHTMLContentContainer.h"
 #include "nsIStyleSet.h"
 #include "nsIURI.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"

 #include "nsIScriptGlobalObject.h"
 #include "nsIWebShell.h"
--- a/mozilla/editor/base/nsHTMLEditor.cpp
+++ b/mozilla/editor/base/nsHTMLEditor.cpp
@ -72,7 +72,7 @@

 // netwerk
 #include "nsIURI.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"

 // Drag & Drop, Clipboard
 #include "nsWidgetsCID.h"
--- a/mozilla/editor/composer/src/nsEditorShell.cpp
+++ b/mozilla/editor/composer/src/nsEditorShell.cpp
@ -46,7 +46,7 @@
 #include "nsIHTMLContentContainer.h"
 #include "nsIStyleSet.h"
 #include "nsIURI.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"

 #include "nsIScriptGlobalObject.h"
 #include "nsIWebShell.h"
--- a/mozilla/editor/libeditor/base/nsEditor.cpp
+++ b/mozilla/editor/libeditor/base/nsEditor.cpp
@ -63,7 +63,7 @@
 #include "nsIStringStream.h"
 #include "nsITextContent.h"

-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"

 #include "nsIContent.h"
 #include "nsIContentIterator.h"
--- a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
@ -72,7 +72,7 @@

 // netwerk
 #include "nsIURI.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"

 // Drag & Drop, Clipboard
 #include "nsWidgetsCID.h"
--- a/mozilla/extensions/pics/src/makefile.win
+++ b/mozilla/extensions/pics/src/makefile.win
@ -60,11 +60,6 @@ LINCS = -I$(PUBLIC)/js \
 		-I$(PUBLIC)\xpcom \
 		-I$(PUBLIC)\raptor \
 		-I$(PUBLIC)\pref \
-!ifdef NECKO
-                -I$(PUBLIC)\necko                 \
-!else
-                -I$(PUBLIC)\netlib                \
-!endif
 		-I$(DEPTH)\include \

 MAKE_OBJ_TYPE = DLL
@ -81,11 +76,6 @@ LCFLAGS = \
 LLIBS	= \
 $(LIBNSPR) \
 $(DIST)\lib\js$(MOZ_BITS)$(VERSION_NUMBER).lib \
-!ifdef NECKO
- $(DIST)\lib\neckoutil_s.lib    \
-!else
- $(DIST)\lib\netlib.lib         \
-!endif
 $(DIST)\lib\xpcom.lib \
 $(DIST)\lib\xpcom.lib \
 $(DIST)\lib\gkparser.lib \
--- a/mozilla/extensions/pics/src/nsPICS.cpp
+++ b/mozilla/extensions/pics/src/nsPICS.cpp
@ -30,7 +30,7 @@
 #include "nsIPICS.h"
 #include "nsIPref.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsCOMPtr.h"
 #include "nsIParser.h"
 #include "nsParserCIID.h"
--- a/mozilla/gfx/src/Makefile.in
+++ b/mozilla/gfx/src/Makefile.in
@ -77,7 +77,6 @@ CPPSRCS		= \
 		$(NULL)

 EXTRA_DSO_LDOPTS = \
-		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		$(DIST)/lib/libimg_s.a \
 		$(DIST)/lib/libmozutil_s.a \
--- a/mozilla/gfx/src/nsImageNetContextAsync.cpp
+++ b/mozilla/gfx/src/nsImageNetContextAsync.cpp
@ -42,7 +42,7 @@
 //#include "il_strm.h"
 #include "merrors.h"

-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"

 static NS_DEFINE_IID(kIImageNetContextIID, IL_INETCONTEXT_IID);
 static NS_DEFINE_IID(kIURLIID, NS_IURL_IID);
--- a/mozilla/gfx/src/nsImageURL.cpp
+++ b/mozilla/gfx/src/nsImageURL.cpp
@ -27,7 +27,7 @@
 #include "ilIURL.h"
 #include "nsIURL.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsString.h"


--- a/mozilla/gfx/src/windows/makefile.win
+++ b/mozilla/gfx/src/windows/makefile.win
@ -45,26 +45,26 @@ OBJS =                                  \
 	$(NULL)

 EXPORTS= nsIRenderingContextWin.h \
-		nsIDrawingSurfaceWin.h
+        nsIDrawingSurfaceWin.h

 LINCS= \
-		-I..\
+        -I..\
        -I$(PUBLIC)\raptor \
        -I$(PUBLIC)\xpcom \
        -I$(PUBLIC)\dom \
        -I$(PUBLIC)\js \
 !if defined(NGLAYOUT_DDRAW)
 !if "$(MOZ_VCVER)" == "50"
-		-I$(NGLAYOUT_DDRAW)\include \
+        -I$(NGLAYOUT_DDRAW)\include \
 !else
-		-I$(NGLAYOUT_DDRAW)\inc \
+        -I$(NGLAYOUT_DDRAW)\inc \
 !endif
 !endif
        $(NULL)

 LCFLAGS = \
        $(LCFLAGS) \
-		$(DEFINES) \
+        $(DEFINES) \
        $(NULL)

 include <$(DEPTH)\config\rules.mak>
--- a/mozilla/htmlparser/src/Makefile.in
+++ b/mozilla/htmlparser/src/Makefile.in
@ -109,7 +109,6 @@ EXPORTS		= \
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 EXTRA_DSO_LDOPTS = \
-		$(MOZ_NECKO_UTIL_LIBS) \
 		$(DIST)/lib/libexpat_s.a \
 		$(DIST)/lib/libxmltok_s.a \
 		$(NULL)
--- a/mozilla/htmlparser/src/makefile.win
+++ b/mozilla/htmlparser/src/makefile.win
@ -132,11 +132,6 @@ EXPORTS=					\

 LINCS=  -I$(PUBLIC)\xpcom  \
        -I$(PUBLIC)\raptor \
-!ifdef NECKO
-        -I$(PUBLIC)\necko  \
-!else
-        -I$(PUBLIC)\netlib \
-!endif
        -I$(PUBLIC)\uconv  \
        -I$(PUBLIC)\expat

@ -153,12 +148,6 @@ LCFLAGS = \
 LLIBS=        \
 $(DIST)\lib\xpcom.lib  \
 $(DIST)\lib\expat.lib			\
-!ifdef NECKO
- $(DIST)\lib\neckoutil_s.lib			\
-!endif
-!ifdef MOZ_PERF
- $(DIST)\lib\util.lib			\
-!endif
 $(LIBNSPR)  

 !ifdef MOZ_NO_DEBUG_RTL
--- a/mozilla/htmlparser/src/nsExpatTokenizer.cpp
+++ b/mozilla/htmlparser/src/nsExpatTokenizer.cpp
@ -36,7 +36,7 @@

 #include "prmem.h"
 #include "nsIUnicharInputStream.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIServiceManager.h"
 #include "nsCOMPtr.h"
 #include "nsSpecialSystemDirectory.h"
--- a/mozilla/intl/strres/src/Makefile.in
+++ b/mozilla/intl/strres/src/Makefile.in
@ -38,4 +38,3 @@ EXTRA_DSO_LDOPTS =\
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
-
--- a/mozilla/intl/strres/src/makefile.win
+++ b/mozilla/intl/strres/src/makefile.win
@ -59,10 +59,6 @@ LLIBS=				\
 $(DIST)\lib\xpcom.lib	\
 $(LIBNSPR)  

-!ifdef NECKO
-LLIBS=$(LLIBS) $(DIST)\lib\neckoutil_s.lib
-!endif
-
 !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
 LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
 !endif
--- a/mozilla/intl/strres/src/nsStringBundle.cpp
+++ b/mozilla/intl/strres/src/nsStringBundle.cpp
@ -30,9 +30,7 @@
 #include "nsILocale.h"
 #include "nsIAllocator.h"
 #include "plstr.h"
-
-#include "nsNeckoUtil.h"
-
+#include "nsNetUtil.h"
 #include "nsIURL.h"
 #include "nsIComponentManager.h"
 #include "nsIServiceManager.h"
--- a/mozilla/intl/strres/tests/Makefile.in
+++ b/mozilla/intl/strres/tests/Makefile.in
@ -41,7 +41,6 @@ EXPORT_RESOURCE	= \
 LIBS		= \
 		-lmozjs \
 		-lxpcom \
-		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
--- a/mozilla/intl/uconv/src/makefile.win
+++ b/mozilla/intl/uconv/src/makefile.win
@ -78,20 +78,12 @@ LINCS=					\
 	-I$(PUBLIC)\raptor		\
 	-I$(PUBLIC)\xpcom 		\
 	-I$(PUBLIC)\uconv		\
-#ifdef NECKO
-	-I$(PUBLIC)\necko		\
-#else
-	-I$(PUBLIC)\netlib		\
-#endif
 	-I..\ucvja	  		\
 	-I..\ucvlatin			\
 	$(NULL)

 LLIBS=					\
 $(DIST)\lib\xpcom.lib		\
-!ifdef NECKO
- $(DIST)\lib\neckoutil_s.lib		\
-!endif
 $(LIBNSPR)

 LCFLAGS = \
--- a/mozilla/intl/uconv/src/nsURLProperties.cpp
+++ b/mozilla/intl/uconv/src/nsURLProperties.cpp
@ -24,8 +24,7 @@
 #include "nsIServiceManager.h"
 #include "nsIComponentManager.h"
 #include "nsIURL.h"
-
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"

 static NS_DEFINE_IID(kIPersistentPropertiesIID, NS_IPERSISTENTPROPERTIES_IID);

--- a/mozilla/intl/unicharutil/src/makefile.win
+++ b/mozilla/intl/unicharutil/src/makefile.win
@ -63,7 +63,6 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll

 LLIBS= \
 	$(DIST)\lib\xpcom.lib		\
-	$(DIST)\lib\neckoutil_s.lib	\
 	$(LIBNSPR)	

 include <$(DEPTH)\config\rules.mak>
--- a/mozilla/intl/unicharutil/src/nsEntityConverter.cpp
+++ b/mozilla/intl/unicharutil/src/nsEntityConverter.cpp
@ -25,7 +25,7 @@
 #include "nsIServiceManager.h"
 #include "nsIComponentManager.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"

 //
 // guids
--- a/mozilla/intl/unicharutil/tests/UnicharSelfTest.cpp
+++ b/mozilla/intl/unicharutil/tests/UnicharSelfTest.cpp
@ -30,7 +30,7 @@
 #include "nsUnicharUtilCIID.h"
 #include "nsIProperties.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsCOMPtr.h"

 NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
--- a/mozilla/layout/base/src/nsGenericElement.cpp
+++ b/mozilla/layout/base/src/nsGenericElement.cpp
@ -40,7 +40,7 @@
 #include "nsISizeOfHandler.h"
 #include "nsISupportsArray.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsFrame.h"
 #include "nsIPresShell.h"
 #include "nsIView.h"
--- a/mozilla/layout/base/src/nsPluginViewer.cpp
+++ b/mozilla/layout/base/src/nsPluginViewer.cpp
@ -28,7 +28,7 @@
 #include "nsIStreamListener.h"
 #include "nsIURL.h"
 #include "nsIChannel.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIComponentManager.h"
 #include "nsWidgetsCID.h"
 #include "nsILinkHandler.h"
--- a/mozilla/layout/build/Makefile.in
+++ b/mozilla/layout/build/Makefile.in
@ -77,7 +77,6 @@ EXTRA_DSO_LDOPTS = \
 		$(MKSHLIB_FORCE_ALL) \
 		$(SHARED_LIBRARY_LIBS) \
 		$(MKSHLIB_UNFORCE_ALL) \
-		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		-L$(DIST)/bin \
 		$(NSPR_LIBS) \
--- a/mozilla/layout/build/makefile.win
+++ b/mozilla/layout/build/makefile.win
@ -54,11 +54,6 @@ LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\dom \
 	-I..\xul\content\src \
 !ifdef MOZ_MATHML
 	-I..\mathml\content\src \
-!endif
-!ifdef NECKO
-	-I$(PUBLIC)\necko \
-!else
-	-I$(PUBLIC)\netlib \
 !endif
        -I$(PUBLIC)\rdf

@ -87,11 +82,6 @@ LLIBS=					\
 $(DIST)\lib\gkgfxwin.lib		\
 $(DIST)\lib\timer_s.lib \
 $(DIST)\lib\jsdom.lib		        \
-!ifdef NECKO
- $(DIST)\lib\neckoutil_s.lib	        \
-!else
- $(DIST)\lib\netlib.lib		        \
-!endif
 $(DIST)\lib\js32$(VERSION_NUMBER).lib	\
 !if defined(MOZ_DEBUG) && defined(GLOWCODE) && "$(MOZ_BITS)"=="32"
 $(GLOWDIR)\glowcode.lib                \
--- a/mozilla/layout/build/nsLayoutModule.cpp
+++ b/mozilla/layout/build/nsLayoutModule.cpp
@ -23,7 +23,7 @@
 #include "nsLayoutModule.h"
 #include "nsLayoutCID.h"
 #include "nsIComponentManager.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsICSSStyleSheet.h"
 #include "nsICSSLoader.h"
 #include "nsHTMLAtoms.h"
--- a/mozilla/layout/generic/nsFrameFrame.cpp
+++ b/mozilla/layout/generic/nsFrameFrame.cpp
@ -33,7 +33,7 @@
 #include "nsIComponentManager.h"
 #include "nsIStreamListener.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIDocument.h"
 #include "nsIView.h"
 #include "nsIViewManager.h"
--- a/mozilla/layout/generic/nsImageFrame.cpp
+++ b/mozilla/layout/generic/nsImageFrame.cpp
@ -42,7 +42,7 @@
 #include "nsIIOService.h"
 #include "nsIURL.h"
 #include "nsIServiceManager.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 #include "nsIView.h"
 #include "nsIViewManager.h"
--- a/mozilla/layout/generic/nsImageMap.cpp
+++ b/mozilla/layout/generic/nsImageMap.cpp
@ -28,7 +28,7 @@
 #include "nsIURL.h"
 #include "nsIURL.h"
 #include "nsIServiceManager.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsXIFConverter.h"
 #include "nsISizeOfHandler.h"
 #include "nsTextFragment.h"
--- a/mozilla/layout/generic/nsObjectFrame.cpp
+++ b/mozilla/layout/generic/nsObjectFrame.cpp
@ -35,7 +35,7 @@
 #include "nsHTMLAtoms.h"
 #include "nsIDocument.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIPluginInstanceOwner.h"
 #include "nsIHTMLContent.h"
 #include "nsISupportsArray.h"
--- a/mozilla/layout/html/base/src/nsHTMLImageLoader.cpp
+++ b/mozilla/layout/html/base/src/nsHTMLImageLoader.cpp
@ -22,7 +22,7 @@
 #include "nsHTMLImageLoader.h"
 #include "nsFrame.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"

 #ifdef DEBUG
 #undef NOISY_IMAGE_LOADING
--- a/mozilla/layout/html/base/src/nsImageFrame.cpp
+++ b/mozilla/layout/html/base/src/nsImageFrame.cpp
@ -42,7 +42,7 @@
 #include "nsIIOService.h"
 #include "nsIURL.h"
 #include "nsIServiceManager.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 #include "nsIView.h"
 #include "nsIViewManager.h"
--- a/mozilla/layout/html/base/src/nsImageMap.cpp
+++ b/mozilla/layout/html/base/src/nsImageMap.cpp
@ -28,7 +28,7 @@
 #include "nsIURL.h"
 #include "nsIURL.h"
 #include "nsIServiceManager.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsXIFConverter.h"
 #include "nsISizeOfHandler.h"
 #include "nsTextFragment.h"
--- a/mozilla/layout/html/base/src/nsObjectFrame.cpp
+++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp
@ -35,7 +35,7 @@
 #include "nsHTMLAtoms.h"
 #include "nsIDocument.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIPluginInstanceOwner.h"
 #include "nsIHTMLContent.h"
 #include "nsISupportsArray.h"
--- a/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp
+++ b/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp
@ -47,7 +47,7 @@
 #include "nsIStyleRule.h"
 #include "nsISupportsArray.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsStyleConsts.h"
 #include "nsXIFConverter.h"
 #include "nsFrame.h"
--- a/mozilla/layout/html/content/src/nsHTMLAnchorElement.cpp
+++ b/mozilla/layout/html/content/src/nsHTMLAnchorElement.cpp
@ -36,7 +36,7 @@

 #include "nsIEventStateManager.h"
 #include "nsDOMEvent.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"

 #include "nsCOMPtr.h"
 #include "nsIFrameManager.h"
--- a/mozilla/layout/html/content/src/nsHTMLImageElement.cpp
+++ b/mozilla/layout/html/content/src/nsHTMLImageElement.cpp
@ -44,7 +44,7 @@
 #include "nsIIOService.h"
 #include "nsIURL.h"
 #include "nsIServiceManager.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);

 // XXX nav attrs: suppress
--- a/mozilla/layout/html/document/src/nsFrameFrame.cpp
+++ b/mozilla/layout/html/document/src/nsFrameFrame.cpp
@ -33,7 +33,7 @@
 #include "nsIComponentManager.h"
 #include "nsIStreamListener.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIDocument.h"
 #include "nsIView.h"
 #include "nsIViewManager.h"
--- a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp
@ -28,7 +28,7 @@
 #include "nsIHTMLContentContainer.h"
 #include "nsIURL.h"
 #include "nsIUnicharStreamLoader.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIPresShell.h"
 #include "nsIPresContext.h"
 #include "nsIViewManager.h"
@ -1940,7 +1940,10 @@ HTMLContentSink::~HTMLContentSink()
  }
 }

-NS_IMPL_ISUPPORTS2(HTMLContentSink, nsIHTMLContentSink, nsIUnicharStreamLoaderObserver)
+NS_IMPL_ISUPPORTS3(HTMLContentSink, 
+                   nsIHTMLContentSink,
+                   nsIContentSink,
+                   nsIUnicharStreamLoaderObserver)

 nsresult
 HTMLContentSink::Init(nsIDocument* aDoc,
@ -3634,10 +3637,11 @@ HTMLContentSink::EvaluateScript(nsString& aScript,
 NS_IMETHODIMP
 HTMLContentSink::OnUnicharStreamComplete(nsIUnicharStreamLoader* aLoader,
                                         nsresult aStatus,
+                                         PRUint32 stringLen,
                                         const PRUnichar* string)
 {
  nsresult rv = NS_OK;
-  nsString aData(string);
+  nsString aData(string, stringLen);

  if (NS_OK == aStatus) {
    PRBool bodyPresent = PreEvaluateScript();
--- a/mozilla/layout/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/layout/html/document/src/nsHTMLDocument.cpp
@ -48,7 +48,7 @@
 #include "nsIURL.h"
 #include "nsIIOService.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIContentViewerContainer.h"
 #include "nsIContentViewer.h"
 #include "nsIMarkupDocumentViewer.h"
--- a/mozilla/layout/html/forms/src/nsFormFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsFormFrame.cpp
@ -60,7 +60,7 @@

 #include "nsIIOService.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 #include "nsIDocument.h"
 #include "nsILinkHandler.h"
--- a/mozilla/layout/html/style/src/nsCSSLoader.cpp
+++ b/mozilla/layout/html/style/src/nsCSSLoader.cpp
@ -37,7 +37,7 @@
 #include "nsIURL.h"
 #include "nsIURL.h"
 #include "nsIServiceManager.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsCRT.h"
 #include "nsVoidArray.h"
 #include "nsISupportsArray.h"
@ -593,9 +593,10 @@ CSSLoaderImpl::RecycleParser(nsICSSParser* aParser)
 NS_IMETHODIMP
 SheetLoadData::OnUnicharStreamComplete(nsIUnicharStreamLoader* aLoader,
                                       nsresult aStatus,
+                                       PRUint32 stringLen,
                                       const PRUnichar* string)
 {
-  nsString aStyleData(string);
+  nsString aStyleData(string, stringLen);
  mLoader->DidLoadStyle(aLoader, aStyleData, this, aStatus);

  // We added a reference when the loader was created. This
--- a/mozilla/layout/html/style/src/nsCSSParser.cpp
+++ b/mozilla/layout/html/style/src/nsCSSParser.cpp
@ -35,7 +35,7 @@
 #include "nsICSSDeclaration.h"
 #include "nsStyleConsts.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsIAtom.h"
--- a/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp
+++ b/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp
@ -28,7 +28,7 @@
 #include "nsIIOService.h"
 #include "nsIURL.h"
 #include "nsIServiceManager.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 #include "nsISupportsArray.h"
 #include "nsHashtable.h"
--- a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp
+++ b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp
@ -28,7 +28,7 @@
 #include "nsIIOService.h"
 #include "nsIURL.h"
 #include "nsIServiceManager.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 #include "nsISupportsArray.h"
 #include "nsHashtable.h"
--- a/mozilla/layout/html/tests/Makefile.in
+++ b/mozilla/layout/html/tests/Makefile.in
@ -44,7 +44,6 @@ LIBS		= \
 		$(DIST)/lib/libraptorhtmltable_s.a \
 		$(DIST)/lib/libraptorlayout_s.a \
 		$(DIST)/lib/libraptorevents_s.a \
-		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		-lmozjs \
 		-lraptorgfx \
--- a/mozilla/layout/html/tests/TestCSSParser.cpp
+++ b/mozilla/layout/html/tests/TestCSSParser.cpp
@ -24,7 +24,7 @@
 #include "nsICSSStyleSheet.h"
 #include "nsIStyleRule.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIIOService.h"
 #include "nsIURL.h"
 #include "nsIInputStream.h"
--- a/mozilla/layout/html/tests/TestCSSScanner.cpp
+++ b/mozilla/layout/html/tests/TestCSSScanner.cpp
@ -22,7 +22,7 @@
 #include <stdio.h>
 #include "nsCSSScanner.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIIOService.h"
 #include "nsIURL.h"
 #include "nsIServiceManager.h"
--- a/mozilla/layout/html/tests/makefile.win
+++ b/mozilla/layout/html/tests/makefile.win
@ -41,11 +41,6 @@ LINCS=				\
  -I$(PUBLIC)\raptor		\
  -I$(PUBLIC)\dom		\
  -I$(PUBLIC)\js		\
-!ifdef NECKO
-  -I$(PUBLIC)\necko		\
-!else
-  -I$(PUBLIC)\netlib		\
-!endif
  -I..\base\src			\
  -I..\style\src		\
  -I..\..\css\layout\src	\
@ -66,11 +61,6 @@ LLIBS=				\
 $(DIST)\lib\util.lib		\
 $(DIST)\lib\xpcom.lib	\
 $(DIST)\lib\jsdom.lib		        \
-!ifdef NECKO
- $(DIST)\lib\neckoutil_s.lib		        \
-!else
- $(DIST)\lib\netlib.lib		        \
-!endif
 $(DIST)\lib\timer_s.lib \
 $(LIBNSPR)			\
 $(DIST)\lib\js32$(VERSION_NUMBER).lib	
--- a/mozilla/layout/style/nsCSSLoader.cpp
+++ b/mozilla/layout/style/nsCSSLoader.cpp
@ -37,7 +37,7 @@
 #include "nsIURL.h"
 #include "nsIURL.h"
 #include "nsIServiceManager.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsCRT.h"
 #include "nsVoidArray.h"
 #include "nsISupportsArray.h"
@ -593,9 +593,10 @@ CSSLoaderImpl::RecycleParser(nsICSSParser* aParser)
 NS_IMETHODIMP
 SheetLoadData::OnUnicharStreamComplete(nsIUnicharStreamLoader* aLoader,
                                       nsresult aStatus,
+                                       PRUint32 stringLen,
                                       const PRUnichar* string)
 {
-  nsString aStyleData(string);
+  nsString aStyleData(string, stringLen);
  mLoader->DidLoadStyle(aLoader, aStyleData, this, aStatus);

  // We added a reference when the loader was created. This
--- a/mozilla/layout/style/nsCSSParser.cpp
+++ b/mozilla/layout/style/nsCSSParser.cpp
@ -35,7 +35,7 @@
 #include "nsICSSDeclaration.h"
 #include "nsStyleConsts.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsIAtom.h"
--- a/mozilla/layout/style/nsCSSStyleSheet.cpp
+++ b/mozilla/layout/style/nsCSSStyleSheet.cpp
@ -28,7 +28,7 @@
 #include "nsIIOService.h"
 #include "nsIURL.h"
 #include "nsIServiceManager.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 #include "nsISupportsArray.h"
 #include "nsHashtable.h"
--- a/mozilla/layout/style/nsHTMLStyleSheet.cpp
+++ b/mozilla/layout/style/nsHTMLStyleSheet.cpp
@ -28,7 +28,7 @@
 #include "nsIIOService.h"
 #include "nsIURL.h"
 #include "nsIServiceManager.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 #include "nsISupportsArray.h"
 #include "nsHashtable.h"
--- a/mozilla/layout/xml/document/src/nsXMLContentSink.cpp
+++ b/mozilla/layout/xml/document/src/nsXMLContentSink.cpp
@ -30,7 +30,7 @@
 #include "nsIScriptObjectOwner.h"
 #include "nsIURL.h"
 #include "nsIURL.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIWebShell.h"
 #include "nsIContent.h"
 #include "nsITextContent.h"
@ -1714,10 +1714,11 @@ IsJavaScriptLanguage(const nsString& aName, const char* *aVersion)
 NS_IMETHODIMP
 nsXMLContentSink::OnUnicharStreamComplete(nsIUnicharStreamLoader* aLoader,
                                          nsresult aStatus,
+                                          PRUint32 stringLen,
                                          const PRUnichar* string)
 {
  nsresult rv = NS_OK;
-  nsString aData(string);
+  nsString aData(string, stringLen);

  if (NS_OK == aStatus) {
    rv = EvaluateScript(aData, 0, mScriptLanguageVersion);
--- a/mozilla/mailnews/base/src/nsMessenger.cpp
+++ b/mozilla/mailnews/base/src/nsMessenger.cpp
@ -96,7 +96,7 @@
 #include "nsIMsgComposeService.h"
 #include "nsMsgCompFieldsFact.h"
 #include "nsMsgI18N.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsXPIDLString.h"

 static NS_DEFINE_CID(kIStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID);
--- a/mozilla/mailnews/compose/src/nsMsgCreate.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgCreate.cpp
@ -50,9 +50,8 @@
 #include "nsMsgCopy.h"
 #include "nsIRDFService.h"
 #include "nsRDFCID.h"
-#include "nsIIOService.h"
+#include "nsNetUtil.h"
 #include "nsMsgMimeCID.h"
-#include "nsNeckoUtil.h"

 // CID's needed
 static NS_DEFINE_CID(kCMsgMailSessionCID, NS_MSGMAILSESSION_CID); 
--- a/mozilla/mailnews/compose/src/nsMsgQuote.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgQuote.cpp
@ -39,7 +39,7 @@
 #include "nsIMsgMessageService.h"
 #include "nsMsgUtils.h"
 #include "nsMsgDeliveryListener.h"
-#include "nsIIOService.h"
+#include "nsNetUtil.h"
 #include "nsMsgMimeCID.h"
 #include "nsMsgCompCID.h"
 #include "nsMsgCompose.h"
@ -90,7 +90,7 @@ nsresult nsMsgQuoteListener::OnHeadersReady(nsIMimeHeaders * headers)

 	printf("RECEIVE CALLBACK: OnHeadersReady\n");
 	nsCOMPtr<nsIStreamListener> aStreamListener;
-  if (mMsgQuote)
+    if (mMsgQuote)
    mMsgQuote->GetStreamListener(getter_AddRefs(aStreamListener));
 	if (aStreamListener)
 	{
@ -185,16 +185,16 @@ nsMsgQuote::QuoteMessage(const PRUnichar *msgURI, PRBool quoteHeaders, nsIStream
                      getter_AddRefs(quoteSupport));

  mQuoteChannel = null_nsCOMPtr();
-  NS_WITH_SERVICE(nsIIOService, netService, kIOServiceCID, &rv);
-  rv = netService->NewInputStreamChannel(aURL, 
-                                         nsnull, // contentType
-                                         -1,     // contentLength
-                                         nsnull, // inputStream
-                                         nsnull, // loadGroup
-                                         nsnull, // notificationCallbacks
-                                         nsIChannel::LOAD_NORMAL,
-                                         nsnull, // originalURI
-                                         getter_AddRefs(mQuoteChannel));
+  rv = NS_NewInputStreamChannel(aURL, 
+                                nsnull, // contentType
+                                -1,     // contentLength
+                                nsnull, // inputStream
+                                nsnull, // loadGroup
+                                nsnull, // notificationCallbacks
+                                nsIChannel::LOAD_NORMAL,
+                                nsnull, // originalURI
+                                getter_AddRefs(mQuoteChannel));
+  if (NS_FAILED(rv)) return rv;

  NS_WITH_SERVICE(nsIStreamConverterService, streamConverterService, kIStreamConverterServiceCID, &rv);
  if (NS_FAILED(rv)) return rv;
@ -207,6 +207,10 @@ nsMsgQuote::QuoteMessage(const PRUnichar *msgURI, PRBool quoteHeaders, nsIStream
                                                mStreamListener,
                                                quoteSupport,
                                                getter_AddRefs(convertedListener));
+  if (NS_FAILED(rv)) return rv;
+
+  NS_WITH_SERVICE(nsIIOService, netService, kIOServiceCID, &rv);
+  if (NS_FAILED(rv)) return rv;

  // now we want to create a necko channel for this url and we want to open it
  nsCOMPtr<nsIChannel> aChannel;
--- a/mozilla/mailnews/compose/tests/compose2/Makefile.in
+++ b/mozilla/mailnews/compose/tests/compose2/Makefile.in
@ -31,7 +31,6 @@ PROGRAM		= msgcomposetest2
 CPPSRCS		= test2.cpp

 LIBS		= \
-		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		-lxpcom \
 		-lmozjs \
--- a/mozilla/mailnews/compose/tests/geturl/Makefile.in
+++ b/mozilla/mailnews/compose/tests/geturl/Makefile.in
@ -32,7 +32,6 @@ CPPSRCS		= \
 		geturl.cpp \
 		nsURLFetcher.cpp \
 		$(NULL)
-		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		-lmozjs \
 		$(NSPR_LIBS) \
--- a/mozilla/mailnews/compose/tests/sendlater/Makefile.in
+++ b/mozilla/mailnews/compose/tests/sendlater/Makefile.in
@ -31,7 +31,6 @@ PROGRAM		= sendlatertest
 CPPSRCS		= test.cpp

 LIBS		= \
-		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		-lraptorgfx \
 		-lxpcom \
--- a/mozilla/mailnews/imap/src/nsImapProtocol.cpp
+++ b/mozilla/mailnews/imap/src/nsImapProtocol.cpp
@ -45,7 +45,7 @@
 #include "nsIWebShell.h"
 #include "nsIImapService.h"
 #include "nsISocketTransportService.h"
-#include "nsIIOService.h"
+#include "nsNetUtil.h"
 #include "nsXPIDLString.h"
 #include "nsIPipe.h"
 #include "nsIMsgFolder.h"
@ -578,9 +578,7 @@ nsresult nsImapProtocol::SetupWithUrl(nsIURI * aURL, nsISupports* aConsumer)
        // as the event sink queue
        if (aRealStreamListener)
        {
-            NS_WITH_SERVICE(nsIIOService, pNetService, kIOServiceCID, &rv);
-            if (NS_FAILED(rv)) return rv; 
-            pNetService->NewAsyncStreamListener(aRealStreamListener, m_sinkEventQueue, getter_AddRefs(m_channelListener));
+            rv = NS_NewAsyncStreamListener(aRealStreamListener, m_sinkEventQueue, getter_AddRefs(m_channelListener));
        }

 		PRUint32 capability = kCapabilityUndefined;
--- a/mozilla/mailnews/mime/src/nsStreamConverter.cpp
+++ b/mozilla/mailnews/mime/src/nsStreamConverter.cpp
@ -40,10 +40,10 @@
 #include "nsIPipe.h"
 #include "nsMimeStringResources.h"
 #include "nsIPref.h"
-#include "nsIIOService.h"
+#include "nsNetUtil.h"
 #include "nsIMsgQuote.h"
 #include "nsIScriptSecurityManager.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"

 static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);

--- a/mozilla/mailnews/mime/tests/mimetest/Makefile.in
+++ b/mozilla/mailnews/mime/tests/mimetest/Makefile.in
@ -33,7 +33,6 @@ LIBS	= \
 		-L$(DIST)/bin \
 		-lmozjs \
 		-lxpcom \
-		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		$(NSPR_LIBS) \
 		$(TK_LIBS) \
--- a/mozilla/mailnews/news/tests/newsParser/Makefile.in
+++ b/mozilla/mailnews/news/tests/newsParser/Makefile.in
@ -30,7 +30,6 @@ PROGRAM		= newsParserTest
 CPPSRCS		= newsParserTest.cpp

 LIBS		= \
-		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		$(DIST)/lib/libmsgnews_s.a \
 		-lmozjs \
--- a/mozilla/mailnews/news/tests/nntp/Makefile.in
+++ b/mozilla/mailnews/news/tests/nntp/Makefile.in
@ -35,7 +35,6 @@ LIBS = \
 	-lxpcom	\
 	-lmozjs	\
 	-lmsgbaseutil \
-	$(MOZ_NECKO_UTIL_LIBS) \
 	$(MOZ_TIMER_LIBS) \
 	$(NSPR_LIBS) \
 	$(TK_LIBS) \
--- a/mozilla/modules/libjar/nsJARChannel.cpp
+++ b/mozilla/modules/libjar/nsJARChannel.cpp
@ -17,7 +17,7 @@
 *
 */

-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIComponentManager.h"
 #include "nsIServiceManager.h"
 #include "nsIFileSpec.h"
--- a/mozilla/modules/libjar/nsJARURI.cpp
+++ b/mozilla/modules/libjar/nsJARURI.cpp
@ -17,7 +17,7 @@
 */

 #include "nsJARURI.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIIOService.h"
 #include "nsCRT.h"
 #include "nsIComponentManager.h"
--- a/mozilla/modules/plugin/base/src/makefile.win
+++ b/mozilla/modules/plugin/base/src/makefile.win
@ -76,12 +76,6 @@ CACHELIBNAME=netcache.lib

 LLIBS = \
 $(DIST)\lib\xpcom.lib \
-!ifdef NECKO
- $(DIST)\lib\neckoutil_s.lib	\
-!else
- $(DIST)\lib\netlib.lib	\
- $(DIST)\lib\$(CACHELIBNAME) \
-!endif
 $(DIST)\lib\xppref32.lib \
 $(LIBNSPR)  

--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@ -40,10 +40,9 @@
 #include "nsIURL.h"
 #include "nsIChannel.h"
 #include "nsCOMPtr.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIProgressEventSink.h"
 #include "nsIDocument.h"
-#include "nsNeckoUtil.h"

 #include "nsIServiceManager.h"
 #include "nsICookieStorage.h"
--- a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp
@ -28,7 +28,7 @@
 #include "nsIStreamListener.h"
 #include "nsIURL.h"
 #include "nsIChannel.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIComponentManager.h"
 #include "nsWidgetsCID.h"
 #include "nsILinkHandler.h"
--- a/mozilla/modules/plugin/nglsrc/makefile.win
+++ b/mozilla/modules/plugin/nglsrc/makefile.win
@ -76,12 +76,6 @@ CACHELIBNAME=netcache.lib

 LLIBS = \
 $(DIST)\lib\xpcom.lib \
-!ifdef NECKO
- $(DIST)\lib\neckoutil_s.lib	\
-!else
- $(DIST)\lib\netlib.lib	\
- $(DIST)\lib\$(CACHELIBNAME) \
-!endif
 $(DIST)\lib\xppref32.lib \
 $(LIBNSPR)  

--- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
@ -40,10 +40,9 @@
 #include "nsIURL.h"
 #include "nsIChannel.h"
 #include "nsCOMPtr.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIProgressEventSink.h"
 #include "nsIDocument.h"
-#include "nsNeckoUtil.h"

 #include "nsIServiceManager.h"
 #include "nsICookieStorage.h"
--- a/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp
+++ b/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp
@ -28,7 +28,7 @@
 #include "nsIStreamListener.h"
 #include "nsIURL.h"
 #include "nsIChannel.h"
-#include "nsNeckoUtil.h"
+#include "nsNetUtil.h"
 #include "nsIComponentManager.h"
 #include "nsWidgetsCID.h"
 #include "nsILinkHandler.h"
--- a/Show More
+++ b/Show More