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 612 matching lines @@
   Map<String, String> _unmodifiableParameters;
 
   _HeaderValue([String this._value = "", Map<String, String> parameters]) {
     if (parameters != null) {
       _parameters = new HashMap<String, String>.from(parameters);
     }
   }
 
   static _HeaderValue parse(String value,
                             {parameterSeparator: ";",
+                             valueSeparator: null,
                              preserveBackslash: false}) {
     // Parse the string.
     var result = new _HeaderValue();
-    result._parse(value, parameterSeparator, preserveBackslash);
+    result._parse(value, parameterSeparator, valueSeparator, preserveBackslash);
     return result;
   }
 
   String get value => _value;
 
   void _ensureParameters() {
     if (_parameters == null) {
       _parameters = new HashMap<String, String>();
     }
   }
@@ skipping 10 matching lines @@
     StringBuffer sb = new StringBuffer();
     sb.write(_value);
     if (parameters != null && parameters.length > 0) {
       _parameters.forEach((String name, String value) {
         sb..write("; ")..write(name)..write("=")..write(value);
       });
     }
     return sb.toString();
   }
 
-  void _parse(String s, String parameterSeparator, bool preserveBackslash) {
+  void _parse(String s,
+        String parameterSeparator,
+        String valueSeparator,
+        bool preserveBackslash) {
     int index = 0;
 
     bool done() => index == s.length;
 
     void skipWS() {
       while (!done()) {
         if (s[index] != " " && s[index] != "\t") return;
         index++;
       }
     }
 
     String parseValue() {
       int start = index;
       while (!done()) {
         if (s[index] == " " ||
             s[index] == "\t" ||
+            s[index] == valueSeparator ||
             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++;
     }
 
     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] == valueSeparator) 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();
-        expect("=");
+        if (done()) {
+          parameters[name] = null;
+          return;
+        }
+        maybeExpect("=");
         skipWS();
+        if(done()) {
+          parameters[name] = null;
+          return;
+        }
         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] == valueSeparator) return;
         expect(parameterSeparator);
       }
     }
 
     skipWS();
     _value = parseValue();
     skipWS();
     if (done()) return;
     maybeExpect(parameterSeparator);
     parseParameters();
@@ skipping 26 matching lines @@
     if (charset != null) {
       _ensureParameters();
       this._parameters["charset"] = charset.toLowerCase();
     }
   }
 
   _ContentType._();
 
   static _ContentType parse(String value) {
     var result = new _ContentType._();
-    result._parse(value, ";", false);
+    result._parse(value, ";", null, false);
     int index = result._value.indexOf("/");
     if (index == -1 || index == (result._value.length - 1)) {
       result._primaryType = result._value.trim().toLowerCase();
       result._subType = "";
     } else {
       result._primaryType =
           result._value.substring(0, index).trim().toLowerCase();
       result._subType = result._value.substring(index + 1).trim().toLowerCase();
     }
     return result;
@@ skipping 156 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'");
       }
     }
   }
 }