зеркало из https://github.com/mozilla/pjs.git
fixes bug 166498 "nsHTTPChunkConv should be cvs removed" r=dougt sr=bzbarsky
This commit is contained in:
Родитель
735c6c2559
Коммит
8c46985968
|
@ -232,7 +232,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsAboutCacheEntry)
|
|||
#include "nsFTPDirListingConv.h"
|
||||
#include "nsGopherDirListingConv.h"
|
||||
#include "nsMultiMixedConv.h"
|
||||
#include "nsHTTPChunkConv.h"
|
||||
#include "nsHTTPCompressConv.h"
|
||||
#include "mozTXTToHTMLConv.h"
|
||||
#include "nsUnknownDecoder.h"
|
||||
|
@ -246,7 +245,6 @@ nsresult NS_NewFTPDirListingConv(nsFTPDirListingConv** result);
|
|||
nsresult NS_NewGopherDirListingConv(nsGopherDirListingConv** result);
|
||||
nsresult NS_NewMultiMixedConv (nsMultiMixedConv** result);
|
||||
nsresult MOZ_NewTXTToHTMLConv (mozTXTToHTMLConv** result);
|
||||
nsresult NS_NewHTTPChunkConv (nsHTTPChunkConv ** result);
|
||||
nsresult NS_NewHTTPCompressConv (nsHTTPCompressConv ** result);
|
||||
nsresult NS_NewNSTXTToHTMLConv(nsTXTToHTMLConv** result);
|
||||
nsresult NS_NewStreamConv(nsStreamConverterService **aStreamConv);
|
||||
|
@ -258,8 +256,6 @@ nsresult NS_NewStreamConv(nsStreamConverterService **aStreamConv);
|
|||
#define MULTI_MIXED "?from=multipart/mixed&to=*/*"
|
||||
#define MULTI_BYTERANGES "?from=multipart/byteranges&to=*/*"
|
||||
#define UNKNOWN_CONTENT "?from=application/x-unknown-content-type&to=*/*"
|
||||
#define CHUNKED_TO_UNCHUNKED "?from=chunked&to=unchunked"
|
||||
#define UNCHUNKED_TO_CHUNKED "?from=unchunked&to=chunked"
|
||||
#define GZIP_TO_UNCOMPRESSED "?from=gzip&to=uncompressed"
|
||||
#define XGZIP_TO_UNCOMPRESSED "?from=x-gzip&to=uncompressed"
|
||||
#define COMPRESS_TO_UNCOMPRESSED "?from=compress&to=uncompressed"
|
||||
|
@ -279,8 +275,6 @@ static const char *const g_StreamConverterArray[] = {
|
|||
MULTI_MIXED,
|
||||
MULTI_BYTERANGES,
|
||||
UNKNOWN_CONTENT,
|
||||
CHUNKED_TO_UNCHUNKED,
|
||||
UNCHUNKED_TO_CHUNKED,
|
||||
GZIP_TO_UNCOMPRESSED,
|
||||
XGZIP_TO_UNCOMPRESSED,
|
||||
COMPRESS_TO_UNCOMPRESSED,
|
||||
|
@ -467,30 +461,6 @@ CreateNewTXTToHTMLConvFactory(nsISupports* aOuter, REFNSIID aIID, void **aResult
|
|||
return rv;
|
||||
}
|
||||
|
||||
static NS_IMETHODIMP
|
||||
CreateNewHTTPChunkConvFactory (nsISupports* aOuter, REFNSIID aIID, void **aResult)
|
||||
{
|
||||
if (!aResult) {
|
||||
return NS_ERROR_INVALID_POINTER;
|
||||
}
|
||||
if (aOuter) {
|
||||
*aResult = nsnull;
|
||||
return NS_ERROR_NO_AGGREGATION;
|
||||
}
|
||||
nsHTTPChunkConv* inst = nsnull;
|
||||
nsresult rv = NS_NewHTTPChunkConv (&inst);
|
||||
if (NS_FAILED(rv)) {
|
||||
*aResult = nsnull;
|
||||
return rv;
|
||||
}
|
||||
rv = inst->QueryInterface(aIID, aResult);
|
||||
if (NS_FAILED(rv)) {
|
||||
*aResult = nsnull;
|
||||
}
|
||||
NS_RELEASE(inst); /* get rid of extra refcnt */
|
||||
return rv;
|
||||
}
|
||||
|
||||
static NS_IMETHODIMP
|
||||
CreateNewHTTPCompressConvFactory (nsISupports* aOuter, REFNSIID aIID, void **aResult)
|
||||
{
|
||||
|
@ -808,18 +778,6 @@ static const nsModuleComponentInfo gNetModuleInfo[] = {
|
|||
CreateNewUnknownDecoderFactory
|
||||
},
|
||||
|
||||
{ "HttpChunkConverter",
|
||||
NS_HTTPCHUNKCONVERTER_CID,
|
||||
NS_ISTREAMCONVERTER_KEY CHUNKED_TO_UNCHUNKED,
|
||||
CreateNewHTTPChunkConvFactory
|
||||
},
|
||||
|
||||
{ "HttpChunkConverter",
|
||||
NS_HTTPCHUNKCONVERTER_CID,
|
||||
NS_ISTREAMCONVERTER_KEY UNCHUNKED_TO_CHUNKED,
|
||||
CreateNewHTTPChunkConvFactory
|
||||
},
|
||||
|
||||
{ "HttpCompressConverter",
|
||||
NS_HTTPCOMPRESSCONVERTER_CID,
|
||||
NS_ISTREAMCONVERTER_KEY GZIP_TO_UNCOMPRESSED,
|
||||
|
|
|
@ -1233,13 +1233,6 @@
|
|||
<FILEKIND>Text</FILEKIND>
|
||||
<FILEFLAGS>Debug</FILEFLAGS>
|
||||
</FILE>
|
||||
<FILE>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsHTTPChunkConv.cpp</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
<FILEKIND>Text</FILEKIND>
|
||||
<FILEFLAGS>Debug</FILEFLAGS>
|
||||
</FILE>
|
||||
<FILE>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsHTTPCompressConv.cpp</PATH>
|
||||
|
@ -1810,11 +1803,6 @@
|
|||
<PATH>nsUnknownDecoder.cpp</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
<FILEREF>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsHTTPChunkConv.cpp</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
<FILEREF>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsHTTPCompressConv.cpp</PATH>
|
||||
|
@ -3267,13 +3255,6 @@
|
|||
<FILEKIND>Text</FILEKIND>
|
||||
<FILEFLAGS>Debug</FILEFLAGS>
|
||||
</FILE>
|
||||
<FILE>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsHTTPChunkConv.cpp</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
<FILEKIND>Text</FILEKIND>
|
||||
<FILEFLAGS>Debug</FILEFLAGS>
|
||||
</FILE>
|
||||
<FILE>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsHTTPCompressConv.cpp</PATH>
|
||||
|
@ -3844,11 +3825,6 @@
|
|||
<PATH>nsUnknownDecoder.cpp</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
<FILEREF>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsHTTPChunkConv.cpp</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
<FILEREF>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsHTTPCompressConv.cpp</PATH>
|
||||
|
@ -5301,13 +5277,6 @@
|
|||
<FILEKIND>Text</FILEKIND>
|
||||
<FILEFLAGS>Debug</FILEFLAGS>
|
||||
</FILE>
|
||||
<FILE>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsHTTPChunkConv.cpp</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
<FILEKIND>Text</FILEKIND>
|
||||
<FILEFLAGS>Debug</FILEFLAGS>
|
||||
</FILE>
|
||||
<FILE>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsHTTPCompressConv.cpp</PATH>
|
||||
|
@ -5864,11 +5833,6 @@
|
|||
<PATH>nsUnknownDecoder.cpp</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
<FILEREF>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsHTTPChunkConv.cpp</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
<FILEREF>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsHTTPCompressConv.cpp</PATH>
|
||||
|
@ -7311,13 +7275,6 @@
|
|||
<FILEKIND>Text</FILEKIND>
|
||||
<FILEFLAGS>Debug</FILEFLAGS>
|
||||
</FILE>
|
||||
<FILE>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsHTTPChunkConv.cpp</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
<FILEKIND>Text</FILEKIND>
|
||||
<FILEFLAGS>Debug</FILEFLAGS>
|
||||
</FILE>
|
||||
<FILE>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsHTTPCompressConv.cpp</PATH>
|
||||
|
@ -7874,11 +7831,6 @@
|
|||
<PATH>nsUnknownDecoder.cpp</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
<FILEREF>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsHTTPChunkConv.cpp</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
<FILEREF>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsHTTPCompressConv.cpp</PATH>
|
||||
|
@ -8628,12 +8580,6 @@
|
|||
<PATH>nsGopherDirListingConv.cpp</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
<FILEREF>
|
||||
<TARGETNAME>Necko.shlb</TARGETNAME>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
<PATH>nsHTTPChunkConv.cpp</PATH>
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
<FILEREF>
|
||||
<TARGETNAME>Necko.shlb</TARGETNAME>
|
||||
<PATHTYPE>Name</PATHTYPE>
|
||||
|
|
|
@ -54,7 +54,6 @@ CPPSRCS = \
|
|||
nsGopherDirListingConv.cpp \
|
||||
mozTXTToHTMLConv.cpp \
|
||||
nsUnknownDecoder.cpp \
|
||||
nsHTTPChunkConv.cpp \
|
||||
nsHTTPCompressConv.cpp \
|
||||
nsTXTToHTMLConv.cpp \
|
||||
nsDirIndex.cpp \
|
||||
|
|
Загрузка…
Ссылка в новой задаче