Merge branch 'development' of https://git01.codeplex.com/casablanca into development

Author: Artur Laksberg

Build/Common.Build.settings

@@ -39,6 +39,9 @@
     <CasablancaSrcDir>$(BuildRoot)\Release\src</CasablancaSrcDir>
     <CasablancaResourceDir>$(BuildRoot)\Release\Resource</CasablancaResourceDir>
     <CasablancaIncludeDir>$(BuildRoot)\Release\include</CasablancaIncludeDir>
+    <WebsocketppIncludeDir>$(BuildRoot)\Release\libs\websocketpp</WebsocketppIncludeDir>
+    <PackagesRoot Condition="'$(PackagesRoot)'=='' AND Exists('$(BuildRoot)\packages')">$(BuildRoot)\packages</PackagesRoot>
+    <PackagesRoot Condition="'$(PackagesRoot)'=='' AND Exists('$(BuildRoot)\..\Tools\packages')">$(BuildRoot)\..\Tools\packages</PackagesRoot>
     <CollateralsDir>$(BuildRoot)\Release\Collateral</CollateralsDir>
     <PocoRoot Condition="'$(PocoRoot)'=='' AND Exists('$(BuildRoot)\..\Tools\poco\poco$(DevToolsVersion)')">$(BuildRoot)\..\Tools\poco\poco$(DevToolsVersion)</PocoRoot>
   </PropertyGroup>

Release/CMakeLists.txt

@@ -24,7 +24,7 @@ if(IOS)
 
   set(BUILD_SHARED_LIBS OFF)
 elseif(UNIX) # This includes OSX
-  find_package(Boost COMPONENTS system thread locale regex filesystem REQUIRED)
+  find_package(Boost REQUIRED COMPONENTS random system thread locale regex filesystem)
   find_package(Threads REQUIRED)
   find_package(OpenSSL REQUIRED)
 
@@ -80,7 +80,8 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
 
 # These settings can be used by the test targets
 set(Casablanca_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
-set(Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include ${Boost_INCLUDE_DIR})
+set(Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include ${Boost_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/libs/websocketpp)
+
 set(Casablanca_LIBRARY ${LIB}cpprest)
 set(Casablanca_LIBRARIES ${Casablanca_LIBRARY} ${Boost_LIBRARIES} ${Boost_FRAMEWORK})
 

Release/include/cpprest/interopstream.h

@@ -87,9 +87,8 @@ namespace Concurrency { namespace streams {
         /// </summary>
         virtual ~basic_stdio_buffer()
         {
-            if( this->can_read() || this->can_write() ) {
-                this->close().wait();
-            }
+            this->_close_read();
+            this->_close_write();
         }
 
     private:

Release/include/cpprest/rawptrstream.h

@@ -27,8 +27,8 @@
 ****/
 #pragma once
 
-#ifndef _CASA_RAWPTR_STREAMS_
-#define _CASA_RAWPTR_STREAMS_
+#ifndef _CASA_RAWPTR_STREAMS_H
+#define _CASA_RAWPTR_STREAMS_H
 
 #include <vector>
 #include <queue>

Release/include/cpprest/ws_client.h

@@ -24,11 +24,12 @@
 ****/
 
 #pragma once
-#if WINAPI_FAMILY == WINAPI_FAMILY_APP
 
 #ifndef _CASA_WS_CLIENT_H
 #define _CASA_WS_CLIENT_H
 
+#if defined(__cplusplus_winrt) || !defined(_M_ARM)
+
 #include <memory>
 #include <limits>
 #include <condition_variable>
@@ -205,6 +206,7 @@ class websocket_exception : public std::exception
 namespace details
 {
 class winrt_client;
+class ws_desktop_client;
 
 // Interface to be implemented by the websocket client implementations.
 class _websocket_client_impl
@@ -381,6 +383,5 @@ class websocket_client
 
 }}}}
 
+#endif
 #endif  /* _CASA_WS_CLIENT_H */
-
-#endif /* WINAPI_FAMILY == WINAPI_FAMILY_APP */

Release/include/cpprest/ws_msg.h

@@ -23,15 +23,17 @@
 * =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 ****/
 #pragma once
-#if WINAPI_FAMILY == WINAPI_FAMILY_APP
 
 #ifndef _CASA_WS_MSG_H
 #define _CASA_WS_MSG_H
 
+#if defined(__cplusplus_winrt) || !defined(_M_ARM)
+
 #include <memory>
 #include <limits>
 
 #include "cpprest/xxpublic.h"
+#include "cpprest/containerstream.h"
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1800)
 #include <ppltasks.h>
@@ -56,6 +58,7 @@ namespace client
 namespace details
 {
     class winrt_client;
+    class ws_desktop_client;
 }
 
 
@@ -97,7 +100,7 @@ class _websocket_message
 
     void set_length(size_t len) { m_length = len; }
 
-    size_t length() { return m_length; } 
+    size_t length() { return m_length; }
 
     websocket_message_type message_type() { return m_msg_type; }
 
@@ -190,6 +193,7 @@ class websocket_outgoing_message
 private:
 
     friend class details::winrt_client;
+    friend class details::ws_desktop_client;
 
     std::shared_ptr<details::_websocket_message> _m_impl;
 
@@ -257,11 +261,12 @@ class websocket_incoming_message
 
 private:
     friend class details::winrt_client;
+    friend class details::ws_desktop_client;
     std::shared_ptr<details::_websocket_message> _m_impl;
 };
 
 }}}}
 
-#endif  /* _CASA_WS_MSG_H */
+#endif
 
-#endif /* WINAPI_FAMILY == WINAPI_FAMILY_APP */
+#endif  /* _CASA_WS_MSG_H */

Release/libs/websocketpp/.gitattributes

@@ -0,0 +1,18 @@
+# Lineendings
+*.sln       eol=crlf
+*.vcproj    eol=crlf
+*.vcxproj*  eol=crlf
+
+# Whitespace rules
+# strict (no trailing, no tabs)
+*.cpp       whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
+*.hpp       whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
+*.c         whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
+*.h         whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
+
+# normal (no trailing)
+*.sql       whitespace=trailing-space,space-before-tab,cr-at-eol
+*.txt       whitespace=trailing-space,space-before-tab,cr-at-eol
+
+# special files which must ignore whitespace
+*.patch     whitespace=-trailing-space

Release/libs/websocketpp/.gitignore

@@ -0,0 +1,80 @@
+# make .git* files visible to git
+!.gitignore
+!.gitattributes
+
+.DS_Store
+
+#vim stuff
+*~
+*.swp
+
+*.o
+*.so
+*.so.?
+*.so.?.?.?
+*.a
+*.dylib
+lib/*
+
+# CMake
+*.cmake
+*.dir
+CMakeFiles
+INSTALL.*
+ZERO_CHECK.*
+CMakeCache.txt
+install_manifest.txt
+
+# Windows/Visual Studio
+*.vcproj*
+*.sln
+*.suo
+*.ncb
+*/Debug/*
+*/*/Debug/*
+*/Release/*
+*/*/Release/*
+*/RelWithDebInfo/*
+*/*/RelWithDebInfo/*
+
+objs_shared/
+objs_static/
+
+examples/chat_server/chat_server
+examples/echo_server/echo_server
+examples/chat_client/chat_client
+examples/echo_client/echo_client
+test/basic/tests
+libwebsocketpp.dylib.0.1.0
+
+websocketpp.xcodeproj/xcuserdata/*
+websocketpp.xcodeproj/project.xcworkspace/xcuserdata/*
+policy_based_notes.hpp
+
+examples/echo_server_tls/echo_server_tls
+
+examples/fuzzing_client/fuzzing_client
+
+examples/stress_client/stress_client
+
+examples/broadcast_server_tls/broadcast_server
+
+test/basic/perf
+
+examples/echo_server_tls/echo_server_tls
+
+examples/concurrent_server/concurrent_server
+
+examples/fuzzing_server_tls/fuzzing_server
+
+examples/wsperf/wsperf
+
+.sconsign.dblite
+
+build/
+doxygen/
+examples/wsperf/wsperf_client
+
+*.out
+
+*.log

Release/libs/websocketpp/.travis.yml

@@ -0,0 +1,22 @@
+language: cpp
+compiler:
+  - gcc
+before_install:
+ - sudo apt-get install libboost-regex1.48-dev libboost-system1.48-dev libboost-thread1.48-dev libboost-test1.48-dev libboost-random1.48-dev -y
+env:
+  global:
+    - BOOST_INCLUDES=/usr/include
+    - BOOST_LIBS=/usr/lib
+script: scons -j 2 && scons test
+branches:
+  only:
+    - master
+    - permessage-deflate
+    - experimental
+    - 0.3.x-cmake
+notifications:
+  recipients:
+    - [email protected]
+  email:
+    on_success: change
+    on_failure: always