Ensure proper response to chrome client_max_window_bits

sdk/lib/io/websocket.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;
 
 /**
  * WebSocket status codes used when closing a WebSocket connection.
  */
 abstract class WebSocketStatus {
@@ skipping 61 matching lines @@
   const CompressionOptions(
       {this.clientNoContextTakeover: false,
       this.serverNoContextTakeover: false,
       this.clientMaxWindowBits: _WebSocketImpl.DEFAULT_WINDOW_BITS,
       this.serverMaxWindowBits: _WebSocketImpl.DEFAULT_WINDOW_BITS,
       this.enabled: true});
 
   /// Parses list of requested server headers to return server compression
   /// response headers. Uses [serverMaxWindowBits] value if set, otherwise will
   /// attempt to use value from headers. Defaults to
   /// [WebSocket.DEFAULT_WINDOW_BITS]

[Søren Gjesse, 2015/11/11 13:31:08]

Please update the documentation to explain the two element list returned.

Actually please use an instance of a class with two meaningful fields.

[butlermatt, 2015/11/11 18:26:30]

Done.

   List _createServerResponseHeader(HeaderValue requested) {
     var info = new List(2);
 
     int mwb;
-    var part = requested.parameters[_serverMaxWindowBits];
+    String part;
+    if (requested?.parameters != null) {
+      part = requested.parameters[_serverMaxWindowBits];
+    }
     if (part != null) {
       if (part.length >= 2 && part.startsWith('0')) {
         throw new ArgumentError("Illegal 0 padding on value.");
       } else {
         mwb = serverMaxWindowBits == null
             ? int.parse(part,
                         onError: (source) => _WebSocketImpl.DEFAULT_WINDOW_BITS)
             : serverMaxWindowBits;
         info[0] = "; server_max_window_bits=${mwb}";
         info[1] = mwb;
       }
     } else {
+      info[0] = "";
       info[1] = _WebSocketImpl.DEFAULT_WINDOW_BITS;
     }
     return info;
   }
 
   /// Returns default values for client compression request headers.
-  List _createClientRequestHeader(HeaderValue requested) {
-    var info = new List(2);
+  List _createClientRequestHeader(HeaderValue requested, int size) {

[Søren Gjesse, 2015/11/11 13:31:08]

This is no longer returning a List.

[butlermatt, 2015/11/11 18:26:30]

Done.

+    var info = "";
 
-    info[1] = _WebSocketImpl.DEFAULT_WINDOW_BITS;
-    if (requested != null &&
-        requested.parameters[_clientMaxWindowBits] != null) {
-      info[0] = "; client_max_window_bits=${info[1]}";
+    // If responding to a valid request, specify size
+    if (requested != null) {
+      info = "; client_max_window_bits=$size";
     } else {
-      info[0] = "; client_max_window_bits";
+      // Client request. Specify default
+      info = "; client_max_window_bits";
     }
 
     return info;
   }
 
   /// Create a Compression Header. If [requested] is null or contains
   /// client request headers, returns Client compression request headers.
   /// If [requested] contains server response headers this method returns
   /// a Server compression response header.
   List _createHeader([HeaderValue requested]) {

[Søren Gjesse, 2015/11/11 13:31:08]

See above.

[butlermatt, 2015/11/11 18:26:30]

Done.

     if (!enabled) {
       return ["", 0];
     }
 
     var info = new List(2);
     var header = _WebSocketImpl.PER_MESSAGE_DEFLATE;
 
     if (clientNoContextTakeover &&
         (requested != null &&
             requested.parameters.containsKey(_clientNoContextTakeover))) {
       header += "; client_no_context_takeover";
     }
 
     if (serverNoContextTakeover &&
         (requested != null &&
             requested.parameters.containsKey(_serverNoContextTakeover))) {
       header += "; server_no_context_takeover";
     }
 
-    if (requested == null ||
-        requested.parameters.containsKey(_clientMaxWindowBits)) {
-      var clientList = _createClientRequestHeader(requested);
-      header += clientList[0];
-      info[1] = clientList[1];
-    } else {
-      var headerList = _createServerResponseHeader(requested);
-      header += headerList[0];
-      info[1] = headerList[1];
-    }
+    var headerList = _createServerResponseHeader(requested);
+    header += headerList[0];
+    info[1] = headerList[1];
+
+    var clientList = _createClientRequestHeader(requested, info[1]);
+    header += clientList;
 
     info[0] = header;
-
     return info;
   }
 }
 
 /**
  * The [WebSocketTransformer] provides the ability to upgrade a
  * [HttpRequest] to a [WebSocket] connection. It supports both
  * upgrading a single [HttpRequest] and upgrading a stream of
  * [HttpRequest]s.
  *
@@ skipping 224 matching lines @@
   Future addStream(Stream stream);
 }
 
 class WebSocketException implements IOException {
   final String message;
 
   const WebSocketException([this.message = ""]);
 
   String toString() => "WebSocketException: $message";
 }