Allow HttpServer response to include custom headers.

net/server/web_socket.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/server/web_socket.h"
 
 #include <limits>
 
 #include "base/base64.h"
 #include "base/rand_util.h"
 #include "base/logging.h"
 #include "base/md5.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_byteorder.h"
 #include "net/server/http_connection.h"
 #include "net/server/http_server_request_info.h"
+#include "net/server/http_server_response_info.h"
 
 namespace net {
 
 namespace {
 
 static uint32 WebSocketKeyFingerprint(const std::string& str) {
   std::string result;
   const char* p_char = str.c_str();
   int length = str.length();
   int spaces = 0;
@@ skipping 79 matching lines @@
  private:
   static const int kWebSocketHandshakeBodyLen;
 
   WebSocketHixie76(HttpConnection* connection,
                    const HttpServerRequestInfo& request,
                    size_t* pos) : WebSocket(connection) {
     std::string key1 = request.GetHeaderValue("Sec-WebSocket-Key1");
     std::string key2 = request.GetHeaderValue("Sec-WebSocket-Key2");
 
     if (key1.empty()) {
-      connection->Send(net::HTTP_INTERNAL_SERVER_ERROR,
-                       "Invalid request format. "
-                           "Sec-WebSocket-Key1 is empty or isn't specified.",
-                       "text/html");
+      connection->Send(HttpServerResponseInfo::For500(
+          "Invalid request format. Sec-WebSocket-Key1 is empty or isn't "
+          "specified."));
       return;
     }
 
     if (key2.empty()) {
-      connection->Send(net::HTTP_INTERNAL_SERVER_ERROR,
-                       "Invalid request format. "
-                           "Sec-WebSocket-Key2 is empty or isn't specified.",
-                       "text/html");
+      connection->Send(HttpServerResponseInfo::For500(
+          "Invalid request format. Sec-WebSocket-Key2 is empty or isn't "
+          "specified."));
       return;
     }
 
     key3_ = connection->recv_data().substr(
         *pos,
         *pos + kWebSocketHandshakeBodyLen);
     *pos += kWebSocketHandshakeBodyLen;
   }
 
   std::string key3_;
@@ skipping 32 matching lines @@
  public:
   static WebSocket* Create(HttpConnection* connection,
                            const HttpServerRequestInfo& request,
                            size_t* pos) {
     std::string version = request.GetHeaderValue("Sec-WebSocket-Version");
     if (version != "8" && version != "13")
       return NULL;
 
     std::string key = request.GetHeaderValue("Sec-WebSocket-Key");
     if (key.empty()) {
-      connection->Send(net::HTTP_INTERNAL_SERVER_ERROR,
-                       "Invalid request format. "
-                           "Sec-WebSocket-Key is empty or isn't specified.",
-                       "text/html");
+      connection->Send(HttpServerResponseInfo::For500(
+          "Invalid request format. Sec-WebSocket-Key is empty or isn't "
+          "specified."));
       return NULL;
     }
     return new WebSocketHybi17(connection, request, pos);
   }
 
   virtual void Accept(const HttpServerRequestInfo& request) OVERRIDE {
     static const char* const kWebSocketGuid =
         "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
     std::string key = request.GetHeaderValue("Sec-WebSocket-Key");
     std::string data = base::StringPrintf("%s%s", key.c_str(), kWebSocketGuid);
@@ skipping 203 matching lines @@
   } else {
     frame.insert(frame.end(), data, data + data_length);
   }
   return std::string(&frame[0], frame.size());
 }
 
 WebSocket::WebSocket(HttpConnection* connection) : connection_(connection) {
 }
 
 }  // namespace net