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

stgates · stgates · commit 0bc80a5bb282 · 2014-07-01T12:41:55.000-07:00
diff --git a/Release/include/cpprest/http_windows_server.h b/Release/include/cpprest/http_windows_server.h
@@ -40,6 +40,7 @@
 #pragma warning(pop)
 
 #include <atomic>
+#include <mutex>
 
 #include "cpprest/http_server.h"
 
diff --git a/Release/src/http/listener/http_windows_server.cpp b/Release/src/http/listener/http_windows_server.cpp
@@ -649,7 +649,7 @@ void windows_request_context::dispatch_request_to_listener(_In_ web::http::exper
             {
                 m_response = responseTask.get();
             }
-            catch (const task_canceled &)
+            catch (const pplx::task_canceled &)
             {
                 // This means the user didn't respond to the request, allowing the
                 // http_request instance to be destroyed. There is nothing to do then

Original file line number	Diff line number	Diff line change
`@@ -649,7 +649,7 @@ void windows_request_context::dispatch_request_to_listener(_In_ web::http::exper`
`649`	`649`	`{`
`650`	`650`	`m_response = responseTask.get();`
`651`	`651`	`}`
`652`		`- catch (const task_canceled &)`
	`652`	`+ catch (const pplx::task_canceled &)`
`653`	`653`	`{`
`654`	`654`	`// This means the user didn't respond to the request, allowing the`
`655`	`655`	`// http_request instance to be destroyed. There is nothing to do then`