Send appropriate pseudo-headers in HTTP/2 CONNECT request.

net/spdy/spdy_http_utils.cc

 // Copyright (c) 2012 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/spdy/spdy_http_utils.h"
 
 #include <string>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 96 matching lines @@
   while (it.GetNext()) {
     std::string name = base::StringToLowerASCII(it.name());
     if (name == "connection" || name == "proxy-connection" ||
         name == "transfer-encoding" || name == "host") {
       continue;
     }
     AddSpdyHeader(name, it.value(), headers);
   }
   static const char kHttpProtocolVersion[] = "HTTP/1.1";
 
-  if (protocol_version < SPDY3) {
-    // TODO(bcn): Remove this code now that SPDY/2 is deprecated.
-    (*headers)["version"] = kHttpProtocolVersion;
-    (*headers)["method"] = info.method;
-    (*headers)["host"] = GetHostAndOptionalPort(info.url);
-    if (info.method == "CONNECT") {
-      (*headers)["url"] = GetHostAndPort(info.url);
-    } else {
-      (*headers)["scheme"] = info.url.scheme();
-      (*headers)["url"] = direct ? info.url.PathForRequest()
-                                 : HttpUtil::SpecForRequest(info.url);
-    }
-  } else {
-    if (protocol_version < HTTP2) {
+  switch (protocol_version) {
+    case SPDY2:
+      // TODO(bnc): Remove this code now that SPDY/2 is deprecated.
+      (*headers)["version"] = kHttpProtocolVersion;
+      (*headers)["method"] = info.method;
+      (*headers)["host"] = GetHostAndOptionalPort(info.url);
+      if (info.method == "CONNECT") {
+        (*headers)["url"] = GetHostAndPort(info.url);
+      } else {
+        (*headers)["scheme"] = info.url.scheme();
+        (*headers)["url"] = direct ? info.url.PathForRequest()
+                                   : HttpUtil::SpecForRequest(info.url);
+      }
+      break;
+    case SPDY3:
       (*headers)[":version"] = kHttpProtocolVersion;
       (*headers)[":host"] = GetHostAndOptionalPort(info.url);
-    } else {
-      (*headers)[":authority"] = GetHostAndOptionalPort(info.url);
-    }
-    (*headers)[":method"] = info.method;
-    if (info.method == "CONNECT") {
-      // TODO(bnc): https://crbug.com/433784
-      (*headers)[":path"] = GetHostAndPort(info.url);
-    } else {
-      (*headers)[":scheme"] = info.url.scheme();
-      (*headers)[":path"] = info.url.PathForRequest();
-    }
+      (*headers)[":method"] = info.method;
+      if (info.method == "CONNECT") {
+        (*headers)[":path"] = GetHostAndPort(info.url);
+      } else {
+        (*headers)[":scheme"] = info.url.scheme();
+        (*headers)[":path"] = info.url.PathForRequest();
+      }
+      break;
+    case HTTP2:
+      (*headers)[":method"] = info.method;
+      if (info.method == "CONNECT") {
+        (*headers)[":authority"] = GetHostAndPort(info.url);
+      } else {
+        (*headers)[":authority"] = GetHostAndOptionalPort(info.url);
+        (*headers)[":scheme"] = info.url.scheme();
+        (*headers)[":path"] = info.url.PathForRequest();
+      }
+      break;
+    default:
+      NOTREACHED();
   }
 }
 
 void CreateSpdyHeadersFromHttpResponse(
     const HttpResponseHeaders& response_headers,
     SpdyMajorVersion protocol_version,
     SpdyHeaderBlock* headers) {
   std::string status_key = (protocol_version >= SPDY3) ? ":status" : "status";
   std::string version_key =
       (protocol_version >= SPDY3) ? ":version" : "version";
@@ skipping 50 matching lines @@
   url.append(it->second);
 
   it = headers.find(":path");
   if (it == headers.end())
     return GURL();
   url.append(it->second);
   return GURL(url);
 }
 
 }  // namespace net