Bug 1323875. r=aosmond a=jcristau
authorTimothy Nikkel <tnikkel@gmail.com>
Thu, 05 Jan 2017 22:46:11 -0600
changeset 353478 636a4707dc9322b275d2dcd724664077222822f2
parent 353477 9d14fb0994cc6ad9e4a87ab3fc9e244e476a78f2
child 353479 b1207646a147355d57b39255c48f635efbaba2eb
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaosmond, jcristau
bugs1323875
milestone52.0a2
Bug 1323875. r=aosmond a=jcristau
image/imgRequest.cpp
--- a/image/imgRequest.cpp
+++ b/image/imgRequest.cpp
@@ -938,17 +938,19 @@ PrepareForNewPart(nsIRequest* aRequest, 
   nsCOMPtr<nsIChannel> chan(do_QueryInterface(aRequest));
   if (result.mContentType.IsEmpty()) {
     nsresult rv = chan ? chan->GetContentType(result.mContentType)
                        : NS_ERROR_FAILURE;
     if (NS_FAILED(rv)) {
       MOZ_LOG(gImgLog,
               LogLevel::Error, ("imgRequest::PrepareForNewPart -- "
                                 "Content type unavailable from the channel\n"));
-      return result;
+      if (!aIsMultipart) {
+        return result;
+      }
     }
   }
 
   if (chan) {
     chan->GetContentDispositionHeader(result.mContentDisposition);
   }
 
   MOZ_LOG(gImgLog, LogLevel::Debug,