From 55e3ce60fabe7c6d41f3e70e527f4e0316361354 Mon Sep 17 00:00:00 2001 From: kkolinko Date: Wed, 2 Jun 2010 17:34:55 +0000 Subject: [PATCH] Followup to r948043 that was a fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=49095 We should not use PrintWriter(OutputStream), because that implicitly uses the platform default charset. Specify the charset explicitly. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@950682 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/tomcat/util/net/AprEndpoint.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java index 511b46adf..ca8b05749 100644 --- a/java/org/apache/tomcat/util/net/AprEndpoint.java +++ b/java/org/apache/tomcat/util/net/AprEndpoint.java @@ -17,7 +17,7 @@ package org.apache.tomcat.util.net; -import java.io.PrintWriter; +import java.io.OutputStreamWriter; import java.net.InetSocketAddress; import java.security.AccessController; import java.security.PrivilegedAction; @@ -607,12 +607,12 @@ public class AprEndpoint extends AbstractEndpoint { * BSD accept filters. The Acceptor will discard it. */ if (deferAccept) { - PrintWriter pw; + OutputStreamWriter sw; - pw = new PrintWriter(s.getOutputStream()); - pw.print("OPTIONS * HTTP/1.0\r\n" + + sw = new OutputStreamWriter(s.getOutputStream(), "ISO-8859-1"); + sw.write("OPTIONS * HTTP/1.0\r\n" + "User-Agent: Tomcat wakeup connection\r\n\r\n"); - pw.flush(); + sw.flush(); } if (log.isDebugEnabled()) { log.debug("Socket unlock completed for:"+saddr); -- 2.11.0