Skip to content

Commit 9c96420

Browse files
committed
Fixed mimetype for jpg, jpeg and jfif files
1 parent f4ed9c2 commit 9c96420

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

logicaldoc-util/src/main/resources/mimetypes.properties

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,14 +205,10 @@ java text/plain
205205
java text/x-java-source
206206
jcm application/x-java-commerce
207207
jfif image/jpeg
208-
jfif image/pjpeg
209208
jfif-tbnl image/jpeg
210209
jpe image/jpeg
211-
jpe image/pjpeg
212210
jpeg image/jpeg
213-
jpeg image/pjpeg
214211
jpg image/jpeg
215-
jpg image/pjpeg
216212
jps image/x-jps
217213
js application/x-javascript
218214
js application/javascript

logicaldoc-util/src/test/java/com/logicaldoc/util/MimeTypeTest.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void testGetByFilename() {
2121
assertEquals("image/svg+xml", res);
2222

2323
res = MimeType.getByFilename("dddd.jfif");
24-
assertEquals("image/pjpeg", res);
24+
assertEquals("image/jpeg", res);
2525

2626
res = MimeType.getByFilename("dddd.webp");
2727
assertEquals("image/webp", res);
@@ -60,7 +60,7 @@ public void testGetByFilename() {
6060
@Test
6161
public void testGet() {
6262
String res = MimeType.get("jfif");
63-
assertEquals("image/pjpeg", res);
63+
assertEquals("image/jpeg", res);
6464

6565
res = MimeType.get("docx");
6666
assertEquals("application/vnd.openxmlformats-officedocument.wordprocessingml.document", res);
@@ -73,7 +73,13 @@ public void testGet() {
7373
assertEquals("video/mp4", res);
7474

7575
res = MimeType.get(".eml");
76-
assertEquals("message/rfc822", res);
76+
assertEquals("message/rfc822", res);
77+
78+
res = MimeType.get(".jpg");
79+
assertEquals("image/jpeg", res);
80+
81+
res = MimeType.get(".jpeg");
82+
assertEquals("image/jpeg", res);
7783
}
7884

7985
}

0 commit comments

Comments
 (0)