Don't close existing connection on HttpServer close (and stream cancel).

tests/standalone/io/http_client_connect_test.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.
 //
 // VMOptions=
 // VMOptions=--short_socket_read
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
 
 import 'dart:async';
@@ skipping 50 matching lines @@
       client.close();
       asyncEnd();
     });
 }
 
 void testGetServerClose() {
   asyncStart();
   HttpServer.bind("127.0.0.1", 0).then((server) {
     server.listen((request) {
       server.close();
+      new Timer(const Duration(milliseconds: 100), () {
+        request.response.close();
+      });
     });
 
     var client = new HttpClient();
+    client.get("127.0.0.1", server.port, "/")
+      .then((request) => request.close())
+      .then((response) => response.drain())
+      .then((_) => asyncEnd());
+  });
+}
+
+void testGetServerCloseNoKeepAlive() {
+  asyncStart();
+  var client = new HttpClient();
+  HttpServer.bind("127.0.0.1", 0).then((server) {
+    int port = server.port;
+    server.listen((request) {

[Søren Gjesse, 2013/10/23 13:23:25]

Use server.first in the test?

[Anders Johnsen, 2013/10/23 14:12:34]

Done.

+      server.close();
+      request.response.close();
+    });
+
+    client.get("127.0.0.1", port, "/")
+      .then((request) => request.close())
+      .then((response) => response.drain())
+      .then((_) => client.get("127.0.0.1", port, "/"))
+      .then((request) => request.close())
+      .then((_) => Expect.fail('should not succeed'), onError: (_) {})
+      .then((_) => asyncEnd());
+  });
+}
+
+void testGetServerForceClose() {
+  asyncStart();
+  HttpServer.bind("127.0.0.1", 0).then((server) {
+    server.listen((request) {
+      server.close(force: true);
+    });
+
+    var client = new HttpClient();
     client.get("127.0.0.1", server.port, "/")
       .then((request) => request.close())
       .then((response) {
         Expect.fail("Request not expected");
       })
-        .catchError((error) => asyncEnd(),
-                    test: (error) => error is HttpException);
+      .catchError((error) => asyncEnd(),
+                  test: (error) => error is HttpException);
   });
 }
 
-void testGetDataServerClose() {
+void testGetDataServerForceClose() {
   asyncStart();
   var completer = new Completer();
   HttpServer.bind("127.0.0.1", 0).then((server) {
     server.listen((request) {
       request.response.contentLength = 100;
       request.response.write("data");
       request.response.write("more data");
-      completer.future.then((_) => server.close());
+      completer.future.then((_) => server.close(force: true));
     });
 
     var client = new HttpClient();
     client.get("127.0.0.1", server.port, "/")
       .then((request) => request.close())
       .then((response) {
         // Close the (incomplete) response, now that we have seen
         // the response object.
         completer.complete(null);
         int errors = 0;
@@ skipping 22 matching lines @@
       });
   });
 }
 
 
 void main() {
   testGetEmptyRequest();
   testGetDataRequest();
   testGetInvalidHost();
   testGetServerClose();
-  testGetDataServerClose();
+  testGetServerCloseNoKeepAlive();
+  testGetServerForceClose();
+  testGetDataServerForceClose();
   testPostEmptyRequest();
 }