Support parsing a Sec-WebSocket-Extensions header with multiple elements

net/websockets/websocket_extension_parser.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/websockets/websocket_extension_parser.h"
 
 #include "base/strings/string_util.h"
 
 namespace net {
 
 WebSocketExtensionParser::WebSocketExtensionParser() {}
 
 WebSocketExtensionParser::~WebSocketExtensionParser() {}
 
 void WebSocketExtensionParser::Parse(const char* data, size_t size) {
   current_ = data;
   end_ = data + size;
   has_error_ = false;
+  extensions_.clear();
 
-  ConsumeExtension(&extension_);
-  if (has_error_) return;
-  ConsumeSpaces();
-  has_error_ = has_error_ || (current_ != end_);
+  while (true) {
+    ConsumeExtension();
+    if (has_error_)
+      return;
+
+    ConsumeSpaces();
+    DCHECK(!has_error_);
+
+    if (!ConsumeIfMatch(',')) {
+      break;
+    }
+  }
+
+  has_error_ |= current_ != end_;

[yhirano, 2015/03/30 11:02:03]

'|=' is a bitwise operation, so I prefer the original statement.

[tyoshino (SeeGerritForStatus), 2015/03/31 06:17:44]

Oops.. Fixed

 }
 
 void WebSocketExtensionParser::Consume(char c) {
   DCHECK(!has_error_);
   ConsumeSpaces();
   DCHECK(!has_error_);
   if (current_ == end_ || c != current_[0]) {
     has_error_ = true;
     return;
   }
   ++current_;
 }
 
-void WebSocketExtensionParser::ConsumeExtension(WebSocketExtension* extension) {
+void WebSocketExtensionParser::ConsumeExtension() {
   DCHECK(!has_error_);
   base::StringPiece name;
   ConsumeToken(&name);
   if (has_error_) return;
-  *extension = WebSocketExtension(name.as_string());
+  extensions_.push_back(WebSocketExtension(name.as_string()));
 
   while (ConsumeIfMatch(';')) {
     WebSocketExtension::Parameter parameter((std::string()));
     ConsumeExtensionParameter(&parameter);
     if (has_error_) return;
-    extension->Add(parameter);
+    extensions_.back().Add(parameter);
   }
 }
 
 void WebSocketExtensionParser::ConsumeExtensionParameter(
     WebSocketExtension::Parameter* parameter) {
   DCHECK(!has_error_);
   base::StringPiece name, value;
   std::string value_string;
 
   ConsumeToken(&name);
@@ skipping 90 matching lines @@
   return (0 <= c && c <= 31) || c == 127;
 }
 
 // static
 bool WebSocketExtensionParser::IsSeparator(char c) {
   const char separators[] = "()<>@,;:\\\"/[]?={} \t";
   return strchr(separators, c) != NULL;
 }
 
 }  // namespace net