From e5cb554318f2be8c288789e47f80beb242f3cea6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 23 Feb 2012 17:06:46 -0500
Subject: [PATCH] Fixed UTF-8 encoding bug in diff formatter (issue 66)
---
src/com/gitblit/utils/GitWebDiffFormatter.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/utils/GitWebDiffFormatter.java b/src/com/gitblit/utils/GitWebDiffFormatter.java
index 00ea121..50c6c72 100644
--- a/src/com/gitblit/utils/GitWebDiffFormatter.java
+++ b/src/com/gitblit/utils/GitWebDiffFormatter.java
@@ -15,6 +15,7 @@
*/
package com.gitblit.utils;
+import static org.eclipse.jgit.lib.Constants.encode;
import static org.eclipse.jgit.lib.Constants.encodeASCII;
import java.io.ByteArrayOutputStream;
@@ -23,6 +24,7 @@
import org.eclipse.jgit.diff.DiffFormatter;
import org.eclipse.jgit.diff.RawText;
+import org.eclipse.jgit.util.RawParseUtils;
/**
* Returns an html snippet of the diff in the standard Gitweb style.
@@ -111,11 +113,9 @@
break;
}
os.write(prefix);
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- text.writeLine(bos, cur);
- String line = bos.toString();
+ String line = text.getString(cur);
line = StringUtils.escapeForHtml(line, false);
- os.write(line.getBytes());
+ os.write(encode(line));
switch (prefix) {
case '+':
case '-':
@@ -133,7 +133,8 @@
* @return
*/
public String getHtml() {
- String html = os.toString();
+ ByteArrayOutputStream bos = (ByteArrayOutputStream) os;
+ String html = RawParseUtils.decode(bos.toByteArray());
String[] lines = html.split("\n");
StringBuilder sb = new StringBuilder();
sb.append("<div class=\"diff\">");
--
Gitblit v1.9.1