Explorar el Código

Add support for image/svg+xml content type to raw servlet

tags/v1.7.0
James Moger hace 9 años
padre
commit
c8b728c588

+ 1
- 1
src/main/distrib/data/defaults.properties Ver fichero

@@ -1324,7 +1324,7 @@ web.tracwikiExtensions = tracwiki
#
# 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
#

+ 10
- 3
src/main/java/com/gitblit/servlet/RawServlet.java Ver fichero

@@ -28,8 +28,6 @@ import java.util.List;
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.ByteFormat;
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 @@ public class RawServlet extends HttpServlet {
}
}

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 @@ public class RawServlet extends HttpServlet {
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.
*

Cargando…
Cancelar
Guardar