Reapply "Stop working around issue 6984."

pkg/http/test/utils.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.
 
 library utils;
 
 import 'dart:io';
 import 'dart:json';
 import 'dart:uri';
 
@@ skipping 11 matching lines @@
 Uri get dummyUrl => new Uri.fromString('http://dartlang.org/');
 
 /// Starts a new HTTP server.
 void startServer() {
   _server = new HttpServer();
 
   _server.addRequestHandler((request) => request.path == '/error',
       (request, response) {
     response.statusCode = 400;
     response.contentLength = 0;
-    closeResponse(request, response);
+    response.outputStream.close();
   });
 
   _server.addRequestHandler((request) => request.path == '/loop',
       (request, response) {
     var n = int.parse(new Uri.fromString(request.uri).query);
     response.statusCode = 302;
     response.headers.set('location',
         serverUrl.resolve('/loop?${n + 1}').toString());
     response.contentLength = 0;
-    closeResponse(request, response);
+    response.outputStream.close();
   });
 
   _server.addRequestHandler((request) => request.path == '/redirect',
       (request, response) {
     response.statusCode = 302;
     response.headers.set('location', serverUrl.resolve('/').toString());
     response.contentLength = 0;
-    closeResponse(request, response);
+    response.outputStream.close();
   });
 
   _server.defaultRequestHandler = (request, response) {
     consumeInputStream(request.inputStream).then((requestBodyBytes) {
       response.statusCode = 200;
       response.headers.contentType = new ContentType("application", "json");
 
       var requestBody;
       if (requestBodyBytes.isEmpty) {
         requestBody = null;
@@ skipping 36 matching lines @@
 
   _server.listen("127.0.0.1", 0);
 }
 
 /// Stops the current HTTP server.
 void stopServer() {
   _server.close();
   _server = null;
 }
 
-/// Closes [response] while ignoring the body of [request].
-///
-/// Due to issue 6984, it's necessary to drain the request body before closing
-/// the response.
-void closeResponse(HttpRequest request, HttpResponse response) {
-  request.inputStream.onData = request.inputStream.read;
-  request.inputStream.onClosed = response.outputStream.close;
-}
-
 /// A matcher that matches JSON that parses to a value that matches the inner
 /// matcher.
 Matcher parse(matcher) => new _Parse(matcher);
 
 class _Parse extends BaseMatcher {
   final Matcher _matcher;
 
   _Parse(this._matcher);
 
   bool matches(item, MatchState matchState) {
@@ skipping 48 matching lines @@
 const Matcher throwsRedirectLimitExceededException =
     const Throws(isRedirectLimitExceededException);
 
 class _RedirectLimitExceededException extends TypeMatcher {
   const _RedirectLimitExceededException() :
       super("RedirectLimitExceededException");
 
   bool matches(item, MatchState matchState) =>
     item is RedirectLimitExceededException;
 }