From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 08:40:30 -0500
Subject: [PATCH] Merge pull request #75 from thefake/master
---
src/com/gitblit/JsonServlet.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/com/gitblit/JsonServlet.java b/src/com/gitblit/JsonServlet.java
index a795896..3ad2b7d 100644
--- a/src/com/gitblit/JsonServlet.java
+++ b/src/com/gitblit/JsonServlet.java
@@ -41,6 +41,12 @@
private static final long serialVersionUID = 1L;
+ protected final int forbiddenCode = HttpServletResponse.SC_FORBIDDEN;
+
+ protected final int notAllowedCode = HttpServletResponse.SC_METHOD_NOT_ALLOWED;
+
+ protected final int failureCode = HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
+
protected final Logger logger;
public JsonServlet() {
@@ -116,6 +122,7 @@
if (o != null) {
// Send JSON response
String json = JsonUtils.toJsonString(o);
+ response.setCharacterEncoding(Constants.ENCODING);
response.getWriter().append(json);
}
}
--
Gitblit v1.9.1