Update the Strict-Transport-Security grammar to match the spec.

net/base/strict_transport_security_state.cc

 // Copyright (c) 2009 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/base/strict_transport_security_state.h"
 
 #include "base/json_reader.h"
 #include "base/json_writer.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
@@ skipping 47 matching lines @@
   base::Time current_time(base::Time::Now());
   if (current_time > i->second.expiry) {
     enabled_hosts_.erase(i);
     DirtyNotify();
     return false;
   }
 
   return true;
 }
 
-// "X-Force-TLS" ":" "max-age" "=" delta-seconds *1INCLUDESUBDOMAINS
-// INCLUDESUBDOMAINS = [ " includeSubDomains" ]
+// "Strict-Transport-Security" ":"
+//     "max-age" "=" delta-seconds [ ";" "includeSubDomains" ]
 bool StrictTransportSecurityState::ParseHeader(const std::string& value,
                                                int* max_age,
                                                bool* include_subdomains) {
   DCHECK(max_age);
   DCHECK(include_subdomains);
 
   int max_age_candidate;
 
   enum ParserState {
     START,
     AFTER_MAX_AGE_LABEL,
     AFTER_MAX_AGE_EQUALS,
     AFTER_MAX_AGE,
     AFTER_MAX_AGE_INCLUDE_SUB_DOMAINS_DELIMITER,
     AFTER_INCLUDE_SUBDOMAINS,
   } state = START;
 
-  StringTokenizer tokenizer(value, " =");
+  StringTokenizer tokenizer(value, " \t=;");

[agl, 2009/09/08 17:11:41]

:( HTTP is such a terrible protocol

   tokenizer.set_options(StringTokenizer::RETURN_DELIMS);
   while (tokenizer.GetNext()) {
     DCHECK(!tokenizer.token_is_delim() || tokenizer.token().length() == 1);
-    DCHECK(tokenizer.token_is_delim() || *tokenizer.token_begin() != ' ');
     switch (state) {
       case START:
-        if (*tokenizer.token_begin() == ' ')
+        if (IsAsciiWhitespace(*tokenizer.token_begin()))
           continue;
         if (!LowerCaseEqualsASCII(tokenizer.token(), "max-age"))
           return false;
         state = AFTER_MAX_AGE_LABEL;
         break;
 
       case AFTER_MAX_AGE_LABEL:
-        if (*tokenizer.token_begin() == ' ')
+        if (IsAsciiWhitespace(*tokenizer.token_begin()))
           continue;
         if (*tokenizer.token_begin() != '=')
           return false;
         DCHECK(tokenizer.token().length() ==  1);
         state = AFTER_MAX_AGE_EQUALS;
         break;
 
       case AFTER_MAX_AGE_EQUALS:
-        if (*tokenizer.token_begin() == ' ')
+        if (IsAsciiWhitespace(*tokenizer.token_begin()))
           continue;
         if (!StringToInt(tokenizer.token(), &max_age_candidate))
           return false;
         if (max_age_candidate < 0)
           return false;
         state = AFTER_MAX_AGE;
         break;
 
       case AFTER_MAX_AGE:
-        if (*tokenizer.token_begin() != ' ')
+        if (IsAsciiWhitespace(*tokenizer.token_begin()))
+          continue;
+        if (*tokenizer.token_begin() != ';')
           return false;
         state = AFTER_MAX_AGE_INCLUDE_SUB_DOMAINS_DELIMITER;
         break;
 
       case AFTER_MAX_AGE_INCLUDE_SUB_DOMAINS_DELIMITER:
-        if (*tokenizer.token_begin() == ' ')
+        if (IsAsciiWhitespace(*tokenizer.token_begin()))
           continue;
         if (!LowerCaseEqualsASCII(tokenizer.token(), "includesubdomains"))
           return false;
         state = AFTER_INCLUDE_SUBDOMAINS;
         break;
 
       case AFTER_INCLUDE_SUBDOMAINS:
-        if (*tokenizer.token_begin() != ' ')
+        if (!IsAsciiWhitespace(*tokenizer.token_begin()))
           return false;
         break;
 
       default:
         NOTREACHED();
     }
   }
 
   // We've consumed all the input.  Let's see what state we ended up in.
   switch (state) {
     case START:
     case AFTER_MAX_AGE_LABEL:
     case AFTER_MAX_AGE_EQUALS:
       return false;
     case AFTER_MAX_AGE:
-    case AFTER_MAX_AGE_INCLUDE_SUB_DOMAINS_DELIMITER:
       *max_age = max_age_candidate;
       *include_subdomains = false;
       return true;
+    case AFTER_MAX_AGE_INCLUDE_SUB_DOMAINS_DELIMITER:
+      return false;
     case AFTER_INCLUDE_SUBDOMAINS:
       *max_age = max_age_candidate;
       *include_subdomains = true;
       return true;
     default:
       NOTREACHED();
       return false;
   }
 }
 
@@ skipping 59 matching lines @@
 
   return enabled_hosts_.size() > 0;
 }
 
 void StrictTransportSecurityState::DirtyNotify() {
   if (delegate_)
     delegate_->StateIsDirty(this);
 }
 
 }  // namespace