Incorporating feedback on websocket subprotocol implementation.

Author: stgates

Release/src/websockets/client/ws_client.cpp

@@ -80,6 +80,8 @@ namespace client
 namespace details
 {
 
+static utility::string_t g_subProtocolHeader(_XPLATSTR("Sec-WebSocket-Protocol"));
+
 class ws_desktop_client : public _websocket_client_impl, public std::enable_shared_from_this<ws_desktop_client>
 {
 private:
@@ -278,18 +280,17 @@ class ws_desktop_client : public _websocket_client_impl, public std::enable_shar
         }
 
         // Add any request headers specified by the user.
-        const utility::string_t protocolHeader(_XPLATSTR("Sec-WebSocket-Protocol"));
         const auto & headers = m_client_config.headers();
         for (const auto & header : headers)
         {
-            if (!utility::details::str_icmp(header.first, protocolHeader))
+            if (!utility::details::str_icmp(header.first, g_subProtocolHeader))
             {
                 con->append_header(utility::conversions::to_utf8string(header.first), utility::conversions::to_utf8string(header.second));
             }
         }
 
         // Add any specified subprotocols.
-        if (headers.has(protocolHeader))
+        if (headers.has(g_subProtocolHeader))
         {
             const std::vector<utility::string_t> protocols = m_client_config.subprotocols();
             for (const auto & value : protocols)

Release/src/websockets/client/ws_msg.cpp

@@ -55,9 +55,10 @@ void websocket_client_config::add_subprotocol(const ::utility::string_t &name)
 std::vector<::utility::string_t> websocket_client_config::subprotocols() const
 {
     std::vector<::utility::string_t> values;
-    if (m_headers.has(g_subProtocolHeader))
+    auto subprotocolHeader = m_headers.find(g_subProtocolHeader);
+    if (subprotocolHeader != m_headers.end())
     {
-        utility::stringstream_t header(m_headers.find(g_subProtocolHeader)->second);
+        utility::stringstream_t header(subprotocolHeader->second);
         utility::string_t token;
         while (std::getline(header, token, U(',')))
         {

Release/src/websockets/client/ws_winrt.cpp

@@ -27,7 +27,7 @@
 #include "stdafx.h"
 #include <concrt.h>
 
-// ws_winrt only available for windows store app or window phone 8.1
+// ws_winrt only available for Windows Store apps and Windows Phone 8.1
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PC_APP) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP) && _WIN32_WINNT == _WIN32_WINNT_WINBLUE)
 
 using namespace ::Windows::Foundation;

Release/tests/Functional/websockets/utilities/test_websocket_server.cpp

@@ -155,7 +155,7 @@ namespace utilities {
 
                 test_websocket_msg wsmsg;
 
-                wsmsg.set_data(std::vector<unsigned char>(pay.begin(), pay.end()));
+                wsmsg.set_data(std::vector<uint8_t>(pay.begin(), pay.end()));
 
                 switch (msg->get_opcode())
                 {

Release/tests/Functional/websockets/utilities/test_websocket_server.h

@@ -57,6 +57,7 @@ enum test_websocket_message_type
 class test_http_request_interface
 {
 public:
+    virtual ~test_http_request_interface() {}
     virtual const std::string& username() = 0;
     virtual const std::string& password() = 0;
     virtual const std::string& get_header_val(const std::string& header_name) = 0;