Touch #276

JimBobSquarePants · JimBobSquarePants · commit 859956df5e93 · 2015-12-21T17:25:20.000+11:00
diff --git a/src/Plugins/ImageProcessor.Web/ImageProcessor.Web.Plugins.AzureBlobCache/AzureBlobCache.cs b/src/Plugins/ImageProcessor.Web/ImageProcessor.Web.Plugins.AzureBlobCache/AzureBlobCache.cs
@@ -381,11 +381,17 @@ public override void RewritePath(HttpContext context)
                         {
                             HttpResponse contextResponse = context.Response;
                             cachedStream.CopyTo(contextResponse.OutputStream);
-                            ImageProcessingModule.SetHeaders(context, this.mimeType, null, this.MaxDays, response.StatusCode);
+
+                            // Mimetype can be null when returning from the cache.
+                            ImageProcessingModule.SetHeaders(
+                                context,
+                                string.IsNullOrWhiteSpace(this.mimeType) ? contextResponse.ContentType : this.mimeType,
+                                null,
+                                this.MaxDays,
+                                response.StatusCode);
                         }
                     }
                 });
-
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -381,11 +381,17 @@ public override void RewritePath(HttpContext context)`
`381`	`381`	`{`
`382`	`382`	`HttpResponse contextResponse = context.Response;`
`383`	`383`	`cachedStream.CopyTo(contextResponse.OutputStream);`
`384`		`- ImageProcessingModule.SetHeaders(context, this.mimeType, null, this.MaxDays, response.StatusCode);`
	`384`	`+`
	`385`	`+ // Mimetype can be null when returning from the cache.`
	`386`	`+ ImageProcessingModule.SetHeaders(`
	`387`	`+ context,`
	`388`	`+ string.IsNullOrWhiteSpace(this.mimeType) ? contextResponse.ContentType : this.mimeType,`
	`389`	`+ null,`
	`390`	`+ this.MaxDays,`
	`391`	`+ response.StatusCode);`
`385`	`392`	`}`
`386`	`393`	`}`
`387`	`394`	`});`
`388`		`-`
`389`	`395`	`}`
`390`	`396`	`else`
`391`	`397`	`{`