JETTY-1098 Default form encoding is UTF8
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@825 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
parent
37501e0c0b
commit
6b6d7e77c3
|
@ -7,6 +7,7 @@ jetty-7.0.0.RC6-SNAPSHOT
|
||||||
+ JETTY-1090 resolve potential infinite loop with webdav listener
|
+ JETTY-1090 resolve potential infinite loop with webdav listener
|
||||||
+ JETTY-1092 MultiPartFilter can be pushed into infinite loop
|
+ JETTY-1092 MultiPartFilter can be pushed into infinite loop
|
||||||
+ JETTY-1093 Request.toString throws exception when size exceeds 4k
|
+ JETTY-1093 Request.toString throws exception when size exceeds 4k
|
||||||
|
+ JETTY-1098 Default form encoding is UTF8
|
||||||
+ 288514 AbstractConnector does not handle InterruptedExceptions on shutdown
|
+ 288514 AbstractConnector does not handle InterruptedExceptions on shutdown
|
||||||
+ 288466 LocalConnector is not thread safe
|
+ 288466 LocalConnector is not thread safe
|
||||||
+ 288772 Failure to connect does not set status to EXCEPTED
|
+ 288772 Failure to connect does not set status to EXCEPTED
|
||||||
|
|
|
@ -492,15 +492,15 @@ public class UrlEncoded extends MultiMap
|
||||||
public static void decodeTo(InputStream in, MultiMap map, String charset, int maxLength)
|
public static void decodeTo(InputStream in, MultiMap map, String charset, int maxLength)
|
||||||
throws IOException
|
throws IOException
|
||||||
{
|
{
|
||||||
if (charset==null || StringUtil.__ISO_8859_1.equals(charset))
|
if (charset==null || StringUtil.__UTF8.equalsIgnoreCase(charset))
|
||||||
{
|
{
|
||||||
decode88591To(in,map,maxLength);
|
decodeUtf8To(in,map,maxLength);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (StringUtil.__UTF8.equalsIgnoreCase(charset))
|
if (StringUtil.__ISO_8859_1.equals(charset))
|
||||||
{
|
{
|
||||||
decodeUtf8To(in,map,maxLength);
|
decode88591To(in,map,maxLength);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -152,7 +152,7 @@ public class URLEncodedTest extends junit.framework.TestCase
|
||||||
{
|
{
|
||||||
String [][] charsets = new String[][]
|
String [][] charsets = new String[][]
|
||||||
{
|
{
|
||||||
{StringUtil.__ISO_8859_1,null},
|
{StringUtil.__UTF8,null},
|
||||||
{StringUtil.__ISO_8859_1,StringUtil.__ISO_8859_1},
|
{StringUtil.__ISO_8859_1,StringUtil.__ISO_8859_1},
|
||||||
{StringUtil.__UTF8,StringUtil.__UTF8},
|
{StringUtil.__UTF8,StringUtil.__UTF8},
|
||||||
{StringUtil.__UTF16,StringUtil.__UTF16},
|
{StringUtil.__UTF16,StringUtil.__UTF16},
|
||||||
|
|
Loading…
Reference in New Issue