fixed HTTP headers case sensitivity issue, separated WSStreamParser f…

…or upcoming WSClient
ITpC · Aug 20, 2018 · ed68dd7 · ed68dd7
1 parent 0afbe0a
commit ed68dd7
Show file tree

Hide file tree

Showing 4 changed files with 421 additions and 374 deletions.
diff --git a/include/Shakespeer.h b/include/Shakespeer.h
@@ -40,6 +40,7 @@
 #include <ePoll.h>
 #include <Config.h>
 #include <ApplicationRegistry.h>
+#include <missing.h>
 
 static const std::vector<uint8_t> forbidden{'H','T','T','P','/','1','.','1',' ','4','0','3',' ','F','o','r','b','i','d','d','e','n'};
 
@@ -152,8 +153,8 @@ namespace LAppS
        {
           mHTTPRParser.parse(headerBuffer,bufflen);
           bool arhap=true;
-          arhap=arhap&&(mHTTPRParser["Connection"]=="Upgrade");
-          arhap=arhap&&(mHTTPRParser["Upgrade"]=="websocket");
+          arhap=arhap&&(itc::utils::toupper(mHTTPRParser["Connection"])==itc::utils::toupper("UPGRADE"));
+          arhap=arhap&&(itc::utils::toupper(mHTTPRParser["Upgrade"])==itc::utils::toupper("WEBSOCKET"));
           arhap=arhap&&(mHTTPRParser["Sec-WebSocket-Version"]=="13");
           arhap=arhap&&(!mHTTPRParser["Sec-WebSocket-Key"].empty());
 
@@ -212,10 +213,9 @@ namespace LAppS
           std::string proto_alias=it.value();
           allow_protocols.append(proto_alias);
           allow_protocols.append("\r\n");
+          okResponse.append(allow_protocols);
         }
 
-        okResponse.append(allow_protocols);
-
         okResponse.append("Sec-WebSocket-Accept: ");
 
         response.resize(okResponse.length());