Don't to do HTML entity decoding for multi-part form fields

pkg/http_server/lib/src/http_multipart_form_data_impl.dart

 // Copyright (c) 2012, 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 http_server;
 
 
 class _HttpMultipartFormData extends Stream implements HttpMultipartFormData {
   final ContentType contentType;
   final HeaderValue contentDisposition;
@@ skipping 14 matching lines @@
     if (contentTransferEncoding != null) {
       // TODO(ajohnsen): Support BASE64, etc.
       throw new HttpException("Unsupported contentTransferEncoding: "
                               "${contentTransferEncoding.value}");
     }
 
     if (contentType == null ||
         contentType.primaryType == 'text' ||
         contentType.mimeType == 'application/json') {
       _isText = true;
       StringBuffer buffer = new StringBuffer();

[kustermann, 2014/11/18 16:34:20]

This StringBuffer is unused now, remove it?

[Søren Gjesse, 2014/11/19 07:41:05]

Done.

       Encoding encoding;
       if (contentType != null) {
         encoding = Encoding.getByName(contentType.charset);

[kustermann, 2014/11/18 16:34:20]

This should be only done

if (contentType != null && contentType.charset != null) {
  ...
}

right?

[Søren Gjesse, 2014/11/19 07:41:05]

Encoding.getByName returns null if the argument is null. Changed anyway.

       }
       if (encoding == null) encoding = defaultEncoding;
-      _stream = _stream
-          .transform(encoding.decoder)
-          .expand((data) {
-            buffer.write(data);
-            var out = _decodeHttpEntityString(buffer.toString());
-            if (out != null) {
-              buffer.clear();
-              return [out];
-            }
-            return const [];
-          });
+      _stream = _stream.transform(encoding.decoder);
     }
   }
 
   bool get isText => _isText;
   bool get isBinary => !_isText;
 
   static HttpMultipartFormData parse(MimeMultipart multipart,
                                      Encoding defaultEncoding) {
     var type;
     var encoding;
@@ skipping 33 matching lines @@
                              bool cancelOnError}) {
     return _stream.listen(onData,
                           onDone: onDone,
                           onError: onError,
                           cancelOnError: cancelOnError);
   }
 
   String value(String name) {
     return _mimeMultipart.headers[name];
   }
-
-  // Decode a string with HTTP entities. Returns null if the string ends in the
-  // middle of a http entity.
-  static String _decodeHttpEntityString(String input) {
-    int amp = input.lastIndexOf('&');
-    if (amp < 0) return input;
-    int end = input.lastIndexOf(';');
-    if (end < amp) return null;
-
-    var buffer = new StringBuffer();
-    int offset = 0;
-
-    parse(amp, end) {
-      switch (input[amp + 1]) {
-        case '#':
-          if (input[amp + 2] == 'x') {
-            buffer.writeCharCode(
-                int.parse(input.substring(amp + 3, end), radix: 16));
-          } else {
-            buffer.writeCharCode(int.parse(input.substring(amp + 2, end)));
-          }
-          break;
-
-        default:
-          throw new HttpException('Unhandled HTTP entity token');
-      }
-    }
-
-    while ((amp = input.indexOf('&', offset)) >= 0) {
-      buffer.write(input.substring(offset, amp));
-      int end = input.indexOf(';', amp);
-      parse(amp, end);
-      offset = end + 1;
-    }
-    buffer.write(input.substring(offset));
-    return buffer.toString();
-  }
 }