Switch CreateSpdyHeadersFromHttpRequest to construct the correct headers based on the spdy protocol…

net/spdy/spdy_http_utils.cc

 // Copyright (c) 2010 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/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 60 matching lines @@
   }
 
   response->headers = new HttpResponseHeaders(raw_headers);
   response->was_fetched_via_spdy = true;
   return true;
 }
 
 void CreateSpdyHeadersFromHttpRequest(const HttpRequestInfo& info,
                                       const HttpRequestHeaders& request_headers,
                                       spdy::SpdyHeaderBlock* headers,
+                                      int protocol_version,
                                       bool direct) {
 
   HttpRequestHeaders::Iterator it(request_headers);
   while (it.GetNext()) {
     std::string name = StringToLowerASCII(it.name());
     if (name == "connection" || name == "proxy-connection" ||
         name == "transfer-encoding") {
       continue;
     }
     if (headers->find(name) == headers->end()) {
       (*headers)[name] = it.value();
     } else {
       std::string new_value = (*headers)[name];
       new_value.append(1, '\0');  // +=() doesn't append 0's
       new_value += it.value();
       (*headers)[name] = new_value;
     }
   }
   static const char kHttpProtocolVersion[] = "HTTP/1.1";
 
-  (*headers)["version"] = kHttpProtocolVersion;
-  (*headers)["method"] = info.method;
-  (*headers)["host"] = GetHostAndOptionalPort(info.url);
-  (*headers)["scheme"] = info.url.scheme();
-  if (direct)
-    (*headers)["url"] = HttpUtil::PathForRequest(info.url);
-  else
-    (*headers)["url"] = HttpUtil::SpecForRequest(info.url);
+  if (protocol_version < 3) {
+    (*headers)["version"] = kHttpProtocolVersion;
+    (*headers)["method"] = info.method;
+    (*headers)["host"] = GetHostAndOptionalPort(info.url);
+    (*headers)["scheme"] = info.url.scheme();
+    if (direct)
+      (*headers)["url"] = HttpUtil::PathForRequest(info.url);
+    else
+      (*headers)["url"] = HttpUtil::SpecForRequest(info.url);
+  } else {
+    (*headers)[":version"] = kHttpProtocolVersion;
+    (*headers)[":method"] = info.method;
+    (*headers)[":host"] = GetHostAndOptionalPort(info.url);
+    (*headers)[":scheme"] = info.url.scheme();
+    (*headers)[":path"] = HttpUtil::PathForRequest(info.url);
+    headers->erase("host"); // this is kinda insane, spdy 3 spec

[ramant (doing other things), 2012/03/15 05:41:34]

nit: this -> This. Period at the end of sentence (I think).

[Ryan Hamilton, 2012/03/15 16:38:06]

Done.

+  }
 
 }
 
 // TODO(gavinp): re-adjust this once SPDY v3 has three priority bits,
 // eliminating the need for this folding.
 int ConvertRequestPriorityToSpdyPriority(const RequestPriority priority) {
   DCHECK(HIGHEST <= priority && priority < NUM_PRIORITIES);
   switch (priority) {
     case LOWEST:
       return SPDY_PRIORITY_LOWEST - 1;
     case IDLE:
       return SPDY_PRIORITY_LOWEST;
     default:
       return priority;
   }
 }
 
 }  // namespace net