windymelt

--- play-2.1.0.orig/play-2.1.0/framework/src/play/src/main/scala/play/api/mvc/ContentTypes.scala	2013-02-05 09:51:23.000000000 +0900
+++ play-2.1.0/framework/src/play/src/main/scala/play/api/mvc/ContentTypes.scala	2013-08-31 12:58:01.000000000 +0900
@@ -277,7 +277,7 @@
      */
     def tolerantText(maxLength: Int): BodyParser[String] = BodyParser("text, maxLength=" + maxLength) { request =>
       Traversable.takeUpTo[Array[Byte]](maxLength)
-        .transform(Iteratee.consume[Array[Byte]]().map(c => new String(c, request.charset.getOrElse("utf-8"))))
+        .transform(Iteratee.consume[Array[Byte]]().map(c => new String(c, request.charset.getOrElse("Shift_JIS/*utf-8*/"))))
         .flatMap(Iteratee.eofOrElse(Results.EntityTooLarge))
     }