From: Brian Wolff <bawolff+wn@gmail.com>
Date: Thu, 11 Jun 2015 18:09:09 +0000 (-0600)
Subject: Add image/pjpeg as an alias for image/jpeg
X-Git-Tag: 1.31.0-rc.0~11101^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=32cc74a0411d3bf09e839ee280a1adc42d4528e0

Add image/pjpeg as an alias for image/jpeg

image/pjpeg is a non-standard mime type for progressive jpegs
that is sometimes used. Not considering this an alias of normal
jpeg images was causing content type validation failures in
gwtoolset.

Bug: T102136
Change-Id: I505f16c4e8e4ee2e2a4675f4f07c4b8c12f9d187
---

diff --git a/includes/mime.info b/includes/mime.info
index 243e280239..840b9d81a5 100644
--- a/includes/mime.info
+++ b/includes/mime.info
@@ -9,7 +9,7 @@
 image/gif	[BITMAP]
 image/png image/x-png	[BITMAP]
 image/ief	[BITMAP]
-image/jpeg	[BITMAP]
+image/jpeg image/pjpeg	[BITMAP]
 image/jp2	[BITMAP]
 image/xbm	[BITMAP]
 image/tiff	[BITMAP]