Merge branch 'testing'

Author: ras0219-msft

Release/CMakeLists.txt

@@ -111,7 +111,7 @@ elseif(ANDROID)
     )
 elseif(UNIX) # This includes OSX
 elseif(WIN32)
-  add_definitions(-DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0600)
+  add_definitions(-DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0600 -DWIN32 -D_SCL_SECURE_NO_WARNINGS)
 
   if(NOT BUILD_SHARED_LIBS)
     # This causes cmake to not link the test libraries separately, but instead hold onto their object files.
@@ -120,7 +120,7 @@ elseif(WIN32)
   else()
     set(Casablanca_DEFINITIONS "" CACHE INTERNAL "Definitions for consume casablanca library")
   endif()
-  add_definitions(${Casablanca_DEFINITIONS} -D_WINSOCK_DEPRECATED_NO_WARNINGS -DWIN32)
+  add_definitions(${Casablanca_DEFINITIONS} -D_WINSOCK_DEPRECATED_NO_WARNINGS)
 else()
   message(FATAL_ERROR "-- Unsupported Build Platform.")
 endif()

Release/include/cpprest/details/http_server_asio.h

@@ -22,6 +22,7 @@ set(SOURCES
   http/listener/http_listener.cpp
   http/listener/http_listener_msg.cpp
   http/listener/http_server_api.cpp
+  http/listener/http_server_impl.h
   http/oauth/oauth1.cpp
   http/oauth/oauth2.cpp
   json/json.cpp
@@ -101,7 +102,9 @@ endif()
 if(CPPREST_HTTP_LISTENER_IMPL STREQUAL "asio")
   list(APPEND SOURCES http/listener/http_server_asio.cpp)
 elseif(CPPREST_HTTP_LISTENER_IMPL STREQUAL "httpsys")
-  list(APPEND SOURCES http/listener/http_server_httpsys.cpp)
+  list(APPEND SOURCES
+    http/listener/http_server_httpsys.cpp
+    http/listener/http_server_httpsys.h)
 endif()
 
 if(MSVC)

Release/src/CMakeLists.txt

@@ -25,7 +25,6 @@
     <ProjectCapability Include="SourceItemsFromImports" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\http_server_asio.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\pplx\pplxlinux.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\pplx\threadpool.h" />
   </ItemGroup>

Release/src/build/android.vcxitems

@@ -29,9 +29,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\http_server_asio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\pplx\pplxlinux.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Release/src/build/android.vcxitems.filters

@@ -84,6 +84,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\pplx\pplxinterface.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\pplx\pplxtasks.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\http\client\http_client_impl.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\http\listener\http_server_impl.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\http\common\internal_http_helpers.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\pch\stdafx.h" />
   </ItemGroup>

Release/src/build/common.vcxitems

@@ -215,6 +215,9 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\http\client\http_client_impl.h">
       <Filter>Header Files\private</Filter>
     </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\http\listener\http_server_impl.h">
+      <Filter>Header Files\private</Filter>
+    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)..\http\common\internal_http_helpers.h" />
   </ItemGroup>
   <ItemGroup>

Release/src/build/common.vcxitems.filters

@@ -27,7 +27,7 @@
     <ProjectCapability Include="SourceItemsFromImports" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\http_server_httpsys.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\http\listener\http_server_httpsys.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\pplx\pplxwin.h" />
   </ItemGroup>
 </Project>

Release/src/build/win32.vcxitems

@@ -26,7 +26,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\http_server_httpsys.h">
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\http\listener\http_server_httpsys.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\pplx\pplxwin.h">

Release/src/build/win32.vcxitems.filters

@@ -20,6 +20,7 @@
 
 #if defined(ANDROID) || defined(__ANDROID__)
 #include <jni.h>
+#include "pplx/threadpool.h"
 #endif
 
 #if defined(__APPLE__)