From dev-return-106646-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org Wed Jun 02 17:35:17 2010 Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 40222 invoked from network); 2 Jun 2010 17:35:17 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Jun 2010 17:35:17 -0000 Received: (qmail 66335 invoked by uid 500); 2 Jun 2010 17:35:16 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 66273 invoked by uid 500); 2 Jun 2010 17:35:16 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 66264 invoked by uid 99); 2 Jun 2010 17:35:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jun 2010 17:35:16 +0000 X-ASF-Spam-Status: No, hits=-1514.0 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jun 2010 17:35:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5E856238890D; Wed, 2 Jun 2010 17:34:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r950682 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Date: Wed, 02 Jun 2010 17:34:55 -0000 To: dev@tomcat.apache.org From: kkolinko@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100602173455.5E856238890D@eris.apache.org> Author: kkolinko Date: Wed Jun 2 17:34:55 2010 New Revision: 950682 URL: http://svn.apache.org/viewvc?rev=950682&view=rev Log: 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. Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=950682&r1=950681&r2=950682&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed Jun 2 17:34:55 2010 @@ -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 Abstrac * 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); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org