285045 - Set the content type on the channel when sniffing it

Status: RESOLVED FIXED

(Core Graveyard :: File Handling, defect)

Description

[Christian :Biesinger (don't email me, ping me on IRC)]

after we sniffed the type, we should set it on the channel, so that nsITransfer
implementations and the like only see the new type, not the internal
application/x-vnd.mozilla.guess-from-ext type.

Comment 1

[Christian :Biesinger (don't email me, ping me on IRC)]

Attachment: patch

Comment 2

[Darin Fisher]

Comment on attachment 176509 [details] [diff] [review]
patch

>Index: nsExternalHelperAppService.cpp
...
>     if (fileExtension.IsEmpty() || mimeType.IsEmpty()) {
>       // Extension lookup gave us no useful match
>       GetFromTypeAndExtension(NS_LITERAL_CSTRING(APPLICATION_OCTET_STREAM), fileExtension,
>                               getter_AddRefs(mimeInfo));
>+      if (channel)
>+        channel->SetContentType(NS_LITERAL_CSTRING(APPLICATION_OCTET_STREAM));
>+    } else if (channel) {
>+      channel->SetContentType(mimeType);
>     }
>   } 

This code isn't perf critical, so how about writing it like this:

    if (fileExtension.IsEmpty() || mimeType.IsEmpty()) {
      // Extension lookup gave us no useful match
      mimeType.AssignLiteral(APPLICATION_OCTET_STREAM);
      GetFromTypeAndExtension(mimeType, fileExtension,
getter_AddRefs(mimeInfo));
    } 
    if (channel)
      channel->SetContentType(mimeType);

It seems more readable to me, and it probably results in less code.

sr=darin either way

Comment 3

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 176509 [details] [diff] [review]
patch

r=bzbarsky

Comment 4

[Christian :Biesinger (don't email me, ping me on IRC)]

Attachment: patch v2

thanks for the suggestion, I like this way better too.

Comment 5

[Christian :Biesinger (don't email me, ping me on IRC)]

Checking in uriloader/exthandler/nsExternalHelperAppService.cpp;
/cvsroot/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp,v  <-- 
nsExternalHelperAppService.cpp
new revision: 1.284; previous revision: 1.283
done