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

Author: jordanrudd

CONTRIBUTORS.txt

@@ -19,6 +19,7 @@ simonlep
 jracle
 gandziej 
 adish
+LeonidCSIT
 
 AutoDesk Inc.
 Cyrille Fauvel (cyrillef)

Release/include/pplx/pplxtasks.h

@@ -1997,9 +1997,16 @@ namespace details
             }
             catch(...)
             {
-                // This exception could only have come from within the chore body. It should've been caught
-                // and the task should be canceled with exception. Swallow the exception here.
-                _ASSERTE(_HasUserException());
+                // The exception could have come from two places:
+                //   1. From the chore body, so it already should have been caught and canceled.
+                //      In this case swallow the exception.
+                //   2. From trying to actually schedule the task on the scheduler.
+                //      In this case cancel the task with the current exception, otherwise the
+                //      task will never be signaled leading to deadlock when waiting on the task.
+                if (!_HasUserException())
+                {
+                    _CancelWithException(std::current_exception());
+                }
             }
         }
 

Release/tests/functional/websockets/client/close_tests.cpp

@@ -129,7 +129,7 @@ TEST_FIXTURE(uri_address, close_callback_client_with_reason)
 }
 
 // Server sends a close frame (server initiated close)
-TEST_FIXTURE(uri_address, close_callback_client_from_server)
+TEST_FIXTURE(uri_address, close_callback_client_from_server, "Ignore", "319")
 {
     std::string body("hello");
     test_websocket_server server;