Add optional defaultEncoding to HttpBodyHandler, as a way to override default encoding for 'applica…

sdk/lib/io/http_body_impl.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of dart.io;
 
 class _HttpBodyHandlerTransformer
     extends StreamEventTransformer<HttpRequest, HttpRequestBody> {
+  final Encoding _defaultEncoding;
+  _HttpBodyHandlerTransformer(this._defaultEncoding);
+
   void handleData(HttpRequest request, EventSink<HttpRequestBody> sink) {
-    HttpBodyHandler.processRequest(request)
+    _HttpBodyHandler.processRequest(request, _defaultEncoding)
         .then(sink.add, onError: sink.addError);
   }
 }
 
 class _HttpBodyHandler {
-  static Future<HttpRequestBody> processRequest(HttpRequest request) {
-    return process(request, request.headers)
+  static Future<HttpRequestBody> processRequest(
+      HttpRequest request,
+      Encoding defaultEncoding) {
+    return process(request, request.headers, defaultEncoding)
         .then((body) => new _HttpRequestBody(request, body),
               onError: (error) {
                 // Try to send BAD_REQUEST response.
                 request.response.statusCode = HttpStatus.BAD_REQUEST;
                 request.response.close();
                 request.response.done.catchError((_) {});
                 throw error;
               });
   }
 
   static Future<HttpClientResponseBody> processResponse(
-      HttpClientResponse response) {
-    return process(response, response.headers)
+      HttpClientResponse response,
+      Encoding defaultEncoding) {
+    return process(response, response.headers, defaultEncoding)
         .then((body) => new _HttpClientResponseBody(response, body));
   }
 
   static Future<HttpBody> process(Stream<List<int>> stream,
-                                  HttpHeaders headers) {
+                                  HttpHeaders headers,
+                                  Encoding defaultEncoding) {
     ContentType contentType = headers.contentType;
 
     Future<HttpBody> asBinary() {
       return stream
           .fold(new _BufferList(), (buffer, data) => buffer..add(data))
           .then((buffer) => new _HttpBody(contentType,
                                           "binary",
                                           buffer.readBytes()));
     }
 
@@ skipping 60 matching lines @@
         switch (contentType.subType) {
           case "json":
             return asText(Encoding.UTF_8)
                 .then((body) => new _HttpBody(contentType,
                                               "json",
                                               JSON.parse(body.body)));
 
           case "x-www-form-urlencoded":
             return asText(Encoding.ASCII)
                 .then((body) {
-                  var map = _HttpUtils.splitQueryString(body.body);
+                  var map = _HttpUtils.splitQueryString(
+                      body.body, encoding: defaultEncoding);
                   var result = {};
                   String parse(String s) {
-                    return _HttpUtils.decodeHttpEntityString(
-                        _HttpUtils.decodeUrlEncodedString(s));
+                    return _HttpUtils.decodeHttpEntityString(s);
                   }
                   for (var key in map.keys) {
                     result[parse(key)] = parse(map[key]);
                   }
                   return new _HttpBody(contentType, "form", result);
                 });
 
           default:
             break;
         }
@@ skipping 55 matching lines @@
   _HttpClientResponseBody(HttpClientResponse response, HttpBody body)
       : super(body.contentType, body.type, body.body),
         this.response = response;
 
   int get statusCode => response.statusCode;
 
   String get reasonPhrase => response.reasonPhrase;
 
   HttpHeaders get headers => response.headers;
 }