Allow additional headers for WebSocket connect

tests/standalone/io/web_socket_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 332 matching lines @@
         });
       }
 
       for (int i = 0; i < totalConnections; i++) {
         webSocketConnection();
       }
     });
   }
 
   testIndividualUpgrade(int connections) {
+    asyncStart();
     createServer().then((server) {
       server.listen((request) {
           if (WebSocketTransformer.isUpgradeRequest(request)) {
             WebSocketTransformer.upgrade(request).then((webSocket) {
                 webSocket.listen((_) { webSocket.close(); });
                 webSocket.add("Hello");
             });
           } else {
             Expect.isFalse(WebSocketTransformer.isUpgradeRequest(request));
             request.response.statusCode = HttpStatus.OK;
@@ skipping 22 matching lines @@
              .then((request) => request.close())
              .then((response) {
                response.listen((_) { });
                Expect.equals(HttpStatus.OK, response.statusCode);
                }));
       }
 
       Future.wait(futures).then((_) {
         server.close();
         client.close();
+        asyncEnd();
       });
     });
   }
 
   testFromUpgradedSocket() {
     asyncStart();
     createServer().then((server) {
       server.listen((request) {
         Expect.equals('Upgrade', request.headers.value(HttpHeaders.CONNECTION));
         Expect.equals('websocket', request.headers.value(HttpHeaders.UPGRADE));
@@ skipping 20 matching lines @@
 
       WebSocket.connect(url).then((websocket) {
         return websocket.listen((message) {
           Expect.equals("Hello", message);
           websocket.close();
         }).asFuture();
       }).then((_) => server.close());
     });
   }
 
+  void testAdditionalHeaders() {
+    asyncStart();
+    createServer().then((server) {
+      server.listen((request) {
+        Expect.isTrue(WebSocketTransformer.isUpgradeRequest(request));
+        Expect.equals('my-value', request.headers['My-Header'][0]);
+        var header = request.headers['My-Header-Multiple'];
+        Expect.equals(1, header.length);
+        Expect.equals('my-value-1, my-value-2', header[0]);
+        WebSocketTransformer.upgrade(request).then((webSocket) {
+          webSocket.listen((_) { webSocket.close(); });
+          webSocket.add("Hello");
+        });
+      });
+
+      var url = '${secure ? "wss" : "ws"}://$HOST_NAME:${server.port}/';
+      var headers = {'My-Header': 'my-value',
+                     'My-Header-Multiple': ['my-value-1', 'my-value-2']};
+      print(headers);
+      print(headers['My-Header-Multiple'] is Iterable);
+      print(headers['My-Header-Multiple'].length);
+      WebSocket.connect(url, headers: headers).then((websocket) {
+        return websocket.listen((message) {
+          Expect.equals("Hello", message);
+          websocket.close();
+        }).asFuture();
+      }).then((_) {
+        server.close();
+        asyncEnd();
+      });
+    });
+  }
+
+
   void runTests() {
     testRequestResponseClientCloses(2, null, null, 1);
     testRequestResponseClientCloses(2, 3001, null, 2);
     testRequestResponseClientCloses(2, 3002, "Got tired", 3);
     testRequestResponseServerCloses(2, null, null);
     testRequestResponseServerCloses(2, 3001, null);
     testRequestResponseServerCloses(2, 3002, "Got tired");
     testMessageLength(125);
     testMessageLength(126);
     testMessageLength(127);
     testMessageLength(65535);
     testMessageLength(65536);
     testDoubleCloseClient();
     testDoubleCloseServer();
     testImmediateCloseServer();
     testImmediateCloseClient();
     testNoUpgrade();
     testUsePOST();
     testConnections(10, 3002, "Got tired");
     testIndividualUpgrade(5);
     testFromUpgradedSocket();
+    testAdditionalHeaders();
   }
 }
 
 
 void initializeSSL() {
   var testPkcertDatabase = Platform.script.resolve('pkcert').toFilePath();
   SecureSocket.initialize(database: testPkcertDatabase,
                           password: "dartdart");
 }
 
 
 main() {
   new SecurityConfiguration(secure: false).runTests();
   initializeSSL();
   new SecurityConfiguration(secure: true).runTests();
 }