Loosen RFC 1738 compliance check to allow underscores where we already allowe...

net/base/net_util.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/net_util.h"
 
 #include <algorithm>
 #include <map>
 #include <unicode/ucnv.h>
 #include <unicode/uidna.h>
@@ skipping 943 matching lines @@
 inline bool IsHostCharAlpha(char c) {
   // We can just check lowercase because uppercase characters have already been
   // normalized.
   return (c >= 'a') && (c <= 'z');
 }
 
 inline bool IsHostCharDigit(char c) {
   return (c >= '0') && (c <= '9');
 }
 
-bool IsCanonicalizedHostRFC1738Compliant(const std::string& host) {
+bool IsCanonicalizedHostCompliant(const std::string& host) {
   if (host.empty())
     return false;
 
   enum State {
     NOT_IN_COMPONENT,
     IN_COMPONENT_STARTED_DIGIT,
     IN_COMPONENT_STARTED_ALPHA
   } state = NOT_IN_COMPONENT;
-  bool last_char_was_hyphen = false;
+  bool last_char_was_hyphen_or_underscore = false;
 
   for (std::string::const_iterator i(host.begin()); i != host.end(); ++i) {
     const char c = *i;
     if (state == NOT_IN_COMPONENT) {
       if (IsHostCharDigit(c))
         state = IN_COMPONENT_STARTED_DIGIT;
       else if (IsHostCharAlpha(c))
         state = IN_COMPONENT_STARTED_ALPHA;
       else
         return false;
     } else {
       if (c == '.') {
-        if (last_char_was_hyphen)
+        if (last_char_was_hyphen_or_underscore)
           return false;
         state = NOT_IN_COMPONENT;
       } else if (IsHostCharAlpha(c) || IsHostCharDigit(c)) {
-        last_char_was_hyphen = false;
-      } else if (c == '-') {
-        last_char_was_hyphen = true;
+        last_char_was_hyphen_or_underscore = false;
+      } else if ((c == '-') || (c == '_')) {
+        last_char_was_hyphen_or_underscore = true;
       } else {
         return false;
       }
     }
   }
 
   return state == IN_COMPONENT_STARTED_ALPHA;
 }
 
 std::string GetDirectoryListingEntry(const string16& name,
@@ skipping 448 matching lines @@
       if (length > 0)
         ports.insert(StringToInt(WideToASCII(
             allowed_ports.substr(last, length))));
       last = i + 1;
     }
   }
   explicitly_allowed_ports = ports;
 }
 
 }  // namespace net