summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2013-04-12 08:48:19 -0400
committerJames Moger <james.moger@gitblit.com>2013-04-12 08:48:19 -0400
commit5e1f7df4a141997dd698f137eefda8d6e3ba3fa9 (patch)
tree6b275236bde6cc9c07d68ddb1d2b566c2593e276
parentf38c901003d46ee7941ef695ab632bdd75066cb7 (diff)
downloadgitblit-5e1f7df4a141997dd698f137eefda8d6e3ba3fa9.tar.gz
gitblit-5e1f7df4a141997dd698f137eefda8d6e3ba3fa9.zip
Properly set application/json content-type on api calls
-rw-r--r--releases.moxie1
-rw-r--r--src/main/java/com/gitblit/JsonServlet.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/releases.moxie b/releases.moxie
index 1dcf0912..86b4c877 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -26,6 +26,7 @@ r17: {
changes:
- Disable Gson's pretty printing which has a huge performance gain
+ - Properly set application/json content-type on api calls
- Updated Polish translation
additions:
diff --git a/src/main/java/com/gitblit/JsonServlet.java b/src/main/java/com/gitblit/JsonServlet.java
index 3ad2b7d2..3ee4a272 100644
--- a/src/main/java/com/gitblit/JsonServlet.java
+++ b/src/main/java/com/gitblit/JsonServlet.java
@@ -123,6 +123,7 @@ public abstract class JsonServlet extends HttpServlet {
// Send JSON response
String json = JsonUtils.toJsonString(o);
response.setCharacterEncoding(Constants.ENCODING);
+ response.setContentType("application/json");
response.getWriter().append(json);
}
}