safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always read/write Guacamole protocol in UTF-8.

Browse Source
This commit is contained in:
Michael Jumper
2012-07-24 15:33:44 -07:00
parent caafb7536a
commit 48ca5200b9
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole-common/src/main/java/net/sourceforge/guacamole/net/InetGuacamoleSocket.java
View File

@@ -101,8 +101,8 @@ public class InetGuacamoleSocket implements GuacamoleSocket {
sock.setSoTimeout(SOCKET_TIMEOUT); sock.setSoTimeout(SOCKET_TIMEOUT);
// On successful connect, retrieve I/O streams // On successful connect, retrieve I/O streams
reader = new ReaderGuacamoleReader(new InputStreamReader(sock.getInputStream())); reader = new ReaderGuacamoleReader(new InputStreamReader(sock.getInputStream(), "UTF-8"));
writer = new WriterGuacamoleWriter(new OutputStreamWriter(sock.getOutputStream())); writer = new WriterGuacamoleWriter(new OutputStreamWriter(sock.getOutputStream(), "UTF-8"));
} }
catch (IOException e) { catch (IOException e) {

8
guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
View File

@@ -36,10 +36,8 @@ package net.sourceforge.guacamole.servlet;
* *
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
import java.io.*;
import net.sourceforge.guacamole.net.GuacamoleTunnel; import net.sourceforge.guacamole.net.GuacamoleTunnel;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -246,7 +244,7 @@ public abstract class GuacamoleHTTPTunnelServlet extends HttpServlet {
// anything but application/octet-stream. // anything but application/octet-stream.
response.setContentType("application/octet-stream"); response.setContentType("application/octet-stream");
Writer out = response.getWriter(); Writer out = new BufferedWriter(new OutputStreamWriter(response.getOutputStream(), "UTF-8"));
// Detach tunnel and throw error if EOF (and we haven't sent any // Detach tunnel and throw error if EOF (and we haven't sent any
// data yet. // data yet.
@@ -343,7 +341,7 @@ public abstract class GuacamoleHTTPTunnelServlet extends HttpServlet {
GuacamoleWriter writer = tunnel.acquireWriter(); GuacamoleWriter writer = tunnel.acquireWriter();
Reader input = request.getReader(); Reader input = new BufferedReader(new InputStreamReader(request.getInputStream(), "UTF-8"));
char[] buffer = new char[8192]; char[] buffer = new char[8192];
int length; int length;