Web Socket compression - take two

sdk/lib/io/http_headers.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;
 
 class _HttpHeaders implements HttpHeaders {
   final Map<String, List<String>> _headers;
   final String protocolVersion;
 
@@ skipping 663 matching lines @@
         if (s[index] != " " && s[index] != "\t") return;
         index++;
       }
     }
 
     String parseValue() {
       int start = index;
       while (!done()) {
         if (s[index] == " " ||
             s[index] == "\t" ||
+            s[index] == "," ||
             s[index] == parameterSeparator) break;
         index++;
       }
       return s.substring(start, index);
     }
 
     void expect(String expected) {
       if (done() || s[index] != expected) {
         throw new HttpException("Failed to parse header value");
       }
       index++;
     }
 
     void maybeExpect(String expected) {
-      if (s[index] == expected) index++;
+      if (!done() && s[index] == expected) index++;
     }
 
     void parseParameters() {
       var parameters = new HashMap<String, String>();
       _parameters = new UnmodifiableMapView(parameters);
 
       String parseParameterName() {
         int start = index;
         while (!done()) {
-          if (s[index] == " " || s[index] == "\t" || s[index] == "=") break;
+          if (s[index] == " " ||
+              s[index] == "\t" ||
+              s[index] == "=" ||
+              s[index] == ",") break;
           index++;
         }
         return s.substring(start, index).toLowerCase();
       }
 
       String parseParameterValue() {
-        if (s[index] == "\"") {
+        if (!done() && s[index] == "\"") {
           // Parse quoted value.
           StringBuffer sb = new StringBuffer();
           index++;
           while (!done()) {
             if (s[index] == "\\") {
               if (index + 1 == s.length) {
                 throw new HttpException("Failed to parse header value");
               }
               if (preserveBackslash && s[index + 1] != "\"") {
                 sb.write(s[index]);
               }
               index++;
             } else if (s[index] == "\"") {
               index++;
               break;
             }
             sb.write(s[index]);
             index++;
           }
           return sb.toString();
         } else {
           // Parse non-quoted value.
-          return parseValue();
+          var val = parseValue();
+          return val == "" ? null : val;
         }
       }
 
       while (!done()) {
         skipWS();
         if (done()) return;
         String name = parseParameterName();
         skipWS();

[Søren Gjesse, 2015/10/23 15:09:59]

I think you should add

  if (done()) return;

here instead of in maybeExpect.

[butlermatt, 2015/10/23 15:44:11]

Done.

-        expect("=");
+        maybeExpect("=");
         skipWS();

[Søren Gjesse, 2015/10/23 15:09:59]

ditto add

  if (done()) return;

here instead of in parseParameterValue.

[butlermatt, 2015/10/23 15:44:11]

Done.

         String value = parseParameterValue();
         if (name == 'charset' && this is _ContentType) {
           // Charset parameter of ContentTypes are always lower-case.
           value = value.toLowerCase();
         }
         parameters[name] = value;
         skipWS();
         if (done()) return;
+        // TODO: Implement support for multi-valued parameters.
+        if(s[index] == ",") return;
         expect(parameterSeparator);
       }
     }
 
     skipWS();
     _value = parseValue();
     skipWS();
     if (done()) return;
     maybeExpect(parameterSeparator);
     parseParameters();
@@ skipping 203 matching lines @@
             (codeUnit >= 0x23 && codeUnit <= 0x2B) ||
             (codeUnit >= 0x2D && codeUnit <= 0x3A) ||
             (codeUnit >= 0x3C && codeUnit <= 0x5B) ||
             (codeUnit >= 0x5D && codeUnit <= 0x7E))) {
         throw new FormatException(
             "Invalid character in cookie value, code unit: '$codeUnit'");
       }
     }
   }
 }