Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Gunzip things with content-encoding:gzip whose file extension is .zip when

Browse Source 
saving or running helpers.  The idea here is to decompress unless the encoding
and extension match up.  If they do, then don't decompress.  Bug 152275,
r=biesi, sr=darin
This commit is contained in:
bzbarsky%mit.edu 2003-10-09 02:10:25 +00:00
parent 87bf331dbf
commit cf0e81ce47
3 changed files with 44 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
uriloader/exthandler/nsExternalHelperAppService.cpp
View File

@ -263,24 +263,14 @@ static nsExtraMimeTypeEntry extraMimeEntries [] =
#undef MAC_TYPE
/**
* MIME Types for which decoding should be disabled
*/
static const char* const nonDecodableTypes [] = {
"application/tar",
"application/x-tar",
0
};
/**
* File extensions for which decoding should be disabled.
*/
static const char* const nonDecodableExtensions [] = {
"gz",
"tgz",
"zip",
"Z",
0
static nsDefaultMimeTypeEntry nonDecodableExtensions [] = {
{ APPLICATION_GZIP, "gz" },
{ APPLICATION_GZIP, "tgz" },
{ APPLICATION_ZIP, "zip" },
{ APPLICATION_COMPRESS, "Z" }
};
NS_IMPL_THREADSAFE_ISUPPORTS6(
@ -482,27 +472,15 @@ NS_IMETHODIMP nsExternalHelperAppService::DoContent(const char *aMimeContentType
return NS_OK;
}
NS_IMETHODIMP nsExternalHelperAppService::ApplyDecodingForType(const char *aMimeContentType, PRBool *aApplyDecoding)
NS_IMETHODIMP nsExternalHelperAppService::ApplyDecodingForExtension(const char *aExtension, const char* aEncodingType, PRBool *aApplyDecoding)
{
NS_PRECONDITION(aMimeContentType, "Null MIME type");
NS_PRECONDITION(aExtension, "Null extension");
NS_PRECONDITION(aEncodingType, "Null encoding type");
*aApplyDecoding = PR_TRUE;
PRUint32 index;
for (index = 0; nonDecodableTypes[index]; ++index) {
if (!PL_strcasecmp(aMimeContentType, nonDecodableTypes[index])) {
*aApplyDecoding = PR_FALSE;
break;
}
}
return NS_OK;
}
NS_IMETHODIMP nsExternalHelperAppService::ApplyDecodingForExtension(const char *aExtension, PRBool *aApplyDecoding)
{
NS_PRECONDITION(aExtension, "Null Extension");
*aApplyDecoding = PR_TRUE;
PRUint32 index;
for(index = 0; nonDecodableExtensions[index]; ++index) {
if (!PL_strcasecmp(aExtension, nonDecodableExtensions[index])) {
PRUint32 i;
for(i = 0; i < NS_ARRAY_LENGTH(nonDecodableExtensions); ++i) {
if (!PL_strcasecmp(aExtension, nonDecodableExtensions[i].mFileExtension) &&
!PL_strcasecmp(aEncodingType, nonDecodableExtensions[i].mMimeType)) {
*aApplyDecoding = PR_FALSE;
break;
}
@ -1291,22 +1269,33 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo
// Turn off content encoding conversions if needed
PRBool applyConversion = PR_TRUE;
NS_ASSERTION(mHelperAppService, "Not initialized");
mHelperAppService->ApplyDecodingForType(MIMEType, &applyConversion);
if (applyConversion)
nsCOMPtr<nsIURL> sourceURL(do_QueryInterface(mSourceUrl));
if (sourceURL)
{
// Now we double-check that it's OK to decode this extension
nsCOMPtr<nsIURI> channelURI;
aChannel->GetURI(getter_AddRefs(channelURI));
nsCOMPtr<nsIURL> channelURL(do_QueryInterface(channelURI));
if (channelURL)
nsCAutoString extension;
sourceURL->GetFileExtension(extension);
if (!extension.IsEmpty())
{
nsCAutoString extension;
channelURL->GetFileExtension(extension);
if (!extension.IsEmpty())
mHelperAppService->ApplyDecodingForExtension(extension.get(), &applyConversion);
}
nsCOMPtr<nsIUTF8StringEnumerator> encEnum;
encChannel->GetContentEncodings(getter_AddRefs(encEnum));
if (encEnum)
{
PRBool hasMore;
rv = encEnum->HasMore(&hasMore);
if (NS_SUCCEEDED(rv) && hasMore)
{
nsCAutoString encType;
rv = encEnum->GetNext(encType);
if (NS_SUCCEEDED(rv) && !encType.IsEmpty())
{
NS_ASSERTION(mHelperAppService, "Not initialized");
mHelperAppService->ApplyDecodingForExtension(extension.get(),
encType.get(),
&applyConversion);
}
}
}
}
}
encChannel->SetApplyConversion( applyConversion );

13
uriloader/exthandler/nsIExternalHelperAppService.idl
View File

@ -52,16 +52,13 @@ interface nsIExternalHelperAppService : nsISupports
in nsISupports aWindowContext);
/**
* Returns true if this type is to be decoded prior to saving or passing
* off to helper apps, false otherwise
* Returns true if data from a URL with this extension combination
* is to be decoded from aEncodingType prior to saving or passing
* off to helper apps, false otherwise.
*/
boolean applyDecodingForType (in string aMimeContentType);
boolean applyDecodingForExtension(in string aExtension,
in string aEncodingType);
/**
* Returns false if files with this extension are not to be decoded prior
* to saving or passing off to helper apps, false otherwise
*/
boolean applyDecodingForExtension(in string aExtension);
};
/**

4
xpfe/communicator/resources/content/contentAreaUtils.js
View File

@ -270,8 +270,8 @@ function foundHeaderInfo(aSniffer, aData)
getService(Components.interfaces.nsIExternalHelperAppService);
var url = aSniffer.uri.QueryInterface(Components.interfaces.nsIURL);
var urlExt = url.fileExtension;
if (helperAppService.applyDecodingForType(contentType) &&
(!urlExt || helperAppService.applyDecodingForExtension(urlExt))) {
if (helperAppService.applyDecodingForExtension(urlExt,
contentEncodingType)) {
shouldDecode = true;
}
}