Merge branch 'testing' into development

Author: ras0219-msft

Release/CMakeLists.txt

@@ -189,7 +189,15 @@ else()
 endif()
 
 set(Casablanca_LIBRARY ${LIB}cpprest)
-set(Casablanca_LIBRARIES ${Casablanca_LIBRARY} ${Boost_LIBRARIES} ${Boost_FRAMEWORK})
+set(Casablanca_LIBRARIES ${Casablanca_LIBRARY}
+  ${Boost_FILESYSTEM_LIBRARY}
+  ${Boost_SYSTEM_LIBRARY}
+  ${Boost_THREAD_LIBRARY}
+  ${Boost_ATOMIC_LIBRARY}
+  ${Boost_CHRONO_LIBRARY}
+  ${Boost_RANDOM_LIBRARY}
+  ${Boost_REGEX_LIBRARY}
+  ${Boost_FRAMEWORK})
 
 # Everything in the project needs access to the casablanca include directories
 include_directories(${Casablanca_INCLUDE_DIRS})

Release/src/http/client/http_client_asio.cpp

@@ -76,10 +76,10 @@ class asio_connection
 public:
     asio_connection(boost::asio::io_service& io_service, bool start_with_ssl, const std::function<void(boost::asio::ssl::context&)>& ssl_context_callback) :
     m_socket(io_service),
+    m_ssl_context_callback(ssl_context_callback),
     m_pool_timer(io_service),
     m_is_reused(false),
-    m_keep_alive(true),
-    m_ssl_context_callback(ssl_context_callback)
+    m_keep_alive(true)
     {
         if (start_with_ssl)
         {

Release/src/websockets/client/ws_client_wspp.cpp

@@ -35,6 +35,7 @@
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wignored-qualifiers"
+#pragma GCC diagnostic ignored "-Wcast-qual"
 #include <websocketpp/config/asio_client.hpp>
 #include <websocketpp/config/asio_no_tls_client.hpp>
 #include <websocketpp/client.hpp>
@@ -774,4 +775,4 @@ websocket_callback_client::websocket_callback_client(websocket_client_config con
 
 }}}
 
-#endif
+#endif

Release/tests/functional/http/client/proxy_tests.cpp

@@ -90,7 +90,7 @@ TEST_FIXTURE(uri_address, no_proxy_options_on_winrt)
 
 #ifndef __cplusplus_winrt
 // Can't specify a proxy with WinRT implementation.
-TEST_FIXTURE(uri_address, http_proxy_with_credentials)
+ TEST_FIXTURE(uri_address, http_proxy_with_credentials, "Ignore:Linux", "Github 53", "Ignore:Apple", "Github 53", "Ignore:Android", "Github 53", "Ignore:IOS", "Github 53")
 {
     uri u(U("http://netproxy.redmond.corp.microsoft.com"));
 
@@ -169,4 +169,4 @@ TEST_FIXTURE(uri_address, https_proxy, "Ignore", "Manual")
 
 } // SUITE(proxy_tests)
 
-}}}}
+}}}}