From c8b728c5887c027eb3bd1db802cdc938d678cb3e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 19 Nov 2014 11:17:59 -0500
Subject: [PATCH] Add support for image/svg+xml content type to raw servlet
---
src/main/java/com/gitblit/servlet/RawServlet.java | 13 ++++++++++---
src/main/distrib/data/defaults.properties | 2 +-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/distrib/data/defaults.properties b/src/main/distrib/data/defaults.properties
index dae2e61..14b3f63 100644
--- a/src/main/distrib/data/defaults.properties
+++ b/src/main/distrib/data/defaults.properties
@@ -1324,7 +1324,7 @@
#
# SPACE-DELIMITED
# SINCE 0.5.0
-web.imageExtensions = bmp jpg jpeg gif png ico
+web.imageExtensions = bmp ico gif jpg jpeg png svg
# Registered extensions for binary blobs
#
diff --git a/src/main/java/com/gitblit/servlet/RawServlet.java b/src/main/java/com/gitblit/servlet/RawServlet.java
index 682e555..dac38f3 100644
--- a/src/main/java/com/gitblit/servlet/RawServlet.java
+++ b/src/main/java/com/gitblit/servlet/RawServlet.java
@@ -28,8 +28,6 @@
import java.util.Map;
import java.util.TreeMap;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -58,6 +56,8 @@
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.MarkdownUtils;
import com.gitblit.utils.StringUtils;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
/**
* Serves the content of a branch.
@@ -248,7 +248,7 @@
}
}
- if (isTextType(contentType)) {
+ if (isTextType(contentType) || isTextDataType(contentType)) {
// load, interpret, and serve text content as UTF-8
String [] encodings = runtimeManager.getSettings().getStrings(Keys.web.blobEncodings).toArray(new String[0]);
@@ -382,6 +382,13 @@
return false;
}
+ protected boolean isTextDataType(String contentType) {
+ if ("image/svg+xml".equals(contentType)) {
+ return true;
+ }
+ return false;
+ }
+
/**
* Override all text types to be plain text.
*
--
Gitblit v1.9.1