From 1e0068e4d4ce79d10a2ea4f6462242bee3708dc8 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sun, 8 Apr 2012 19:00:07 +0900
Subject: WebSocket: Check keyword string in comma separeted values in HTTP
 header field.

---
 src/HttpServerCommand.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/HttpServerCommand.cc')

diff --git a/src/HttpServerCommand.cc b/src/HttpServerCommand.cc
index 026c2627..0e13094e 100644
--- a/src/HttpServerCommand.cc
+++ b/src/HttpServerCommand.cc
@@ -174,10 +174,8 @@ bool HttpServerCommand::execute()
         e_->setNoWait(true);
         return true;
       }
-      const std::string& upgradeHd = header->find("upgrade");
-      const std::string& connectionHd = header->find("connection");
-      if(util::strieq(upgradeHd.begin(), upgradeHd.end(), "websocket") &&
-         util::strieq(connectionHd.begin(), connectionHd.end(), "upgrade")) {
+      if(header->fieldContains("upgrade", "websocket") &&
+         header->fieldContains("connection", "upgrade")) {
 #ifdef ENABLE_WEBSOCKET
         int status = websocketHandshake(header);
         Command* command;
-- 
cgit