Merge pull request cocos2d#14867 from dumganhar/refactor-websocket

WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test).
LovelinMangang · Feb 21, 2016 · 37db840 · 37db840
2 parents 7607382 + 0cb94cc
commit 37db840
Show file tree

Hide file tree

Showing 9 changed files with 793 additions and 529 deletions.
diff --git a/cocos/2d/win10_props/cocos2d_win10_app.props b/cocos/2d/win10_props/cocos2d_win10_app.props
@@ -19,9 +19,6 @@
     <None Include="$(ZLibBinPath)zlib.dll">
       <DeploymentContent>true</DeploymentContent>
     </None>
-    <None Include="$(WebsocketsBinPath)libwebsockets.dll">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
     <None Include="$(SQLiteBinPath)sqlite3.dll">
       <DeploymentContent>true</DeploymentContent>
     </None>

diff --git a/cocos/2d/winrt_8.1_props/cocos2d_winrt_8.1_app.props b/cocos/2d/winrt_8.1_props/cocos2d_winrt_8.1_app.props
@@ -15,9 +15,6 @@
     <None Include="$(AngleBinPath)libGLESv2.dll">
       <DeploymentContent>true</DeploymentContent>
     </None>
-    <None Include="$(WebsocketsBinPath)libwebsockets.dll">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
     <None Include="$(SQLiteBinPath)sqlite3.dll">
       <DeploymentContent>true</DeploymentContent>
     </None>

diff --git a/cocos/base/CCDirector.cpp b/cocos/base/CCDirector.cpp
@@ -61,6 +61,7 @@ THE SOFTWARE.
 #include "base/CCConfiguration.h"
 #include "base/CCAsyncTaskPool.h"
 #include "platform/CCApplication.h"
+#include "network/WebSocket.h"
 
 #if CC_ENABLE_SCRIPT_BINDING
 #include "CCScriptSupport.h"
@@ -976,6 +977,9 @@ void Director::reset()
     _runningScene = nullptr;
     _nextScene = nullptr;
 
+    // Close all websocket connection. It has to be invoked before cleaning scheduler
+    network::WebSocket::closeAllConnections();
+
     // cleanup scheduler
     getScheduler()->unscheduleAll();