Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for bug 170987 - move the FTP protocol into necko from necko2, so that necko.dll isn't required for embedding

Browse Source 
r=gordon, sr=darin


git-svn-id: svn://10.0.0.236/trunk@135944 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alecf%netscape.com
2003-01-07 21:56:32 +00:00
parent ca9654f343
commit 96dd9afe92
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/netwerk/build/Makefile.in
View File

@@ -59,6 +59,7 @@ SHARED_LIBRARY_LIBS = \
$(DIST)/lib/$(LIB_PREFIX)nkmime_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nkhttp_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nkfile_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nkftp_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nkdata_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nkjar_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nkres_s.$(LIB_SUFFIX) \
@@ -77,6 +78,7 @@ LOCAL_INCLUDES = \
-I$(srcdir)/../cache/src \
-I$(srcdir)/../protocol/http/src \
-I$(srcdir)/../protocol/file/src \
-I$(srcdir)/../protocol/ftp/src \
-I$(srcdir)/../protocol/data/src \
-I$(srcdir)/../protocol/jar/src \
-I$(srcdir)/../protocol/res/src \

10
mozilla/netwerk/build/nsNetModule.cpp
View File

@@ -177,6 +177,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsAboutCacheEntry)
///////////////////////////////////////////////////////////////////////////////
#include "nsFtpProtocolHandler.h"
#include "nsFTPDirListingConv.h"
#include "nsGopherDirListingConv.h"
#include "nsMultiMixedConv.h"
@@ -189,6 +190,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsAboutCacheEntry)
#include "nsBinHexDecoder.h"
#endif
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsFtpProtocolHandler, Init);
nsresult NS_NewFTPDirListingConv(nsFTPDirListingConv** result);
nsresult NS_NewGopherDirListingConv(nsGopherDirListingConv** result);
nsresult NS_NewMultiMixedConv (nsMultiMixedConv** result);
@@ -828,6 +831,13 @@ static const nsModuleComponentInfo gNetModuleInfo[] = {
NS_HTTP_AUTHENTICATOR_CONTRACTID_PREFIX "digest",
nsHttpDigestAuthConstructor },
// from netwerk/protocol/ftp:
{ "The FTP Protocol Handler",
NS_FTPPROTOCOLHANDLER_CID,
NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "ftp",
nsFtpProtocolHandlerConstructor
},
// from netwerk/protocol/data:
{ "Data Protocol Handler",
NS_DATAHANDLER_CID,

2
mozilla/netwerk/build2/Makefile.in
View File

@@ -43,13 +43,11 @@ CPPSRCS = nsNetModule2.cpp
SHARED_LIBRARY_LIBS = \
$(DIST)/lib/$(LIB_PREFIX)nkgopher_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nkftp_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nkviewsource_s.$(LIB_SUFFIX) \
$(NULL)
LOCAL_INCLUDES = \
-I$(srcdir)/../protocol/gopher/src \
-I$(srcdir)/../protocol/ftp/src \
-I$(srcdir)/../protocol/viewsource/src \
$(NULL)

10
mozilla/netwerk/build2/nsNetModule2.cpp
View File

@@ -38,11 +38,8 @@
#include "nsIGenericFactory.h"
#include "nsGopherHandler.h"
#include "nsFtpProtocolHandler.h"
#include "nsViewSourceHandler.h"
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsFtpProtocolHandler, Init);
///////////////////////////////////////////////////////////////////////////////
// Module implementation for the net library
@@ -54,13 +51,6 @@ static const nsModuleComponentInfo gNetModuleInfo[] = {
nsGopherHandler::Create
},
// from netwerk/protocol/ftp:
{ "The FTP Protocol Handler",
NS_FTPPROTOCOLHANDLER_CID,
NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "ftp",
nsFtpProtocolHandlerConstructor
},
// from netwerk/protocol/viewsource:
{ "The ViewSource Protocol Handler",
NS_VIEWSOURCEHANDLER_CID,

2
mozilla/netwerk/protocol/ftp/public/Makefile.in
View File

@@ -26,7 +26,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko2
MODULE = necko
XPIDL_MODULE = necko_ftp
GRE_MODULE = 1

2
mozilla/netwerk/protocol/ftp/src/Makefile.in
View File

@@ -26,7 +26,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko2
MODULE = necko
LIBRARY_NAME = nkftp_s
REQUIRES = xpcom \
string \