Author: remy.maucherat(a)jboss.com Date: 2011-11-14 11:53:48 -0500 (Mon, 14 Nov 2011) New Revision: 1867 Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/ajp/AjpMessage.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/http11/InternalAprOutputBuffer.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/http11/InternalNioOutputBuffer.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/http11/InternalOutputBuffer.java Log: - Filter out multibyte chars when writing a char chunk. Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/ajp/AjpMessage.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/ajp/AjpMessage.java 2011-11-14 16:51:49 UTC (rev 1866) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/ajp/AjpMessage.java 2011-11-14 16:53:48 UTC (rev 1867) @@ -218,10 +218,8 @@ // but is the only consistent approach within the current // servlet framework. It must suffice until servlet output // streams properly encode their output. - if ((c <= 31) && (c != 9)) { + if (((c <= 31) && (c != 9)) || c == 127 || c > 255) { c = ' '; - } else if (c == 127) { - c = ' '; } appendByte(c); } Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/http11/InternalAprOutputBuffer.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/http11/InternalAprOutputBuffer.java 2011-11-14 16:51:49 UTC (rev 1866) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/http11/InternalAprOutputBuffer.java 2011-11-14 16:53:48 UTC (rev 1867) @@ -613,10 +613,8 @@ // but is the only consistent approach within the current // servlet framework. It must suffice until servlet output // streams properly encode their output. - if ((c <= 31) && (c != 9)) { + if (((c <= 31) && (c != 9)) || c == 127 || c > 255) { c = ' '; - } else if (c == 127) { - c = ' '; } buf[pos++] = (byte) c; } Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/http11/InternalNioOutputBuffer.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/http11/InternalNioOutputBuffer.java 2011-11-14 16:51:49 UTC (rev 1866) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/http11/InternalNioOutputBuffer.java 2011-11-14 16:53:48 UTC (rev 1867) @@ -674,10 +674,8 @@ // but is the only consistent approach within the current // servlet framework. It must suffice until servlet output // streams properly encode their output. - if ((c <= 31) && (c != 9)) { + if (((c <= 31) && (c != 9)) || c == 127 || c > 255) { c = ' '; - } else if (c == 127) { - c = ' '; } buf[pos++] = (byte) c; } Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/http11/InternalOutputBuffer.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/http11/InternalOutputBuffer.java 2011-11-14 16:51:49 UTC (rev 1866) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/coyote/http11/InternalOutputBuffer.java 2011-11-14 16:53:48 UTC (rev 1867) @@ -659,10 +659,8 @@ // but is the only consistent approach within the current // servlet framework. It must suffice until servlet output // streams properly encode their output. - if ((c <= 31) && (c != 9)) { + if (((c <= 31) && (c != 9)) || c == 127 || c > 255) { c = ' '; - } else if (c == 127) { - c = ' '; } buf[pos++] = (byte) c; }