15 Commits

Author	SHA1	Message	Date
James Chen	ae737365d7	issue #2305: Sleep(50) on Win32, usleep(50000) on unix --> std::this_thread::sleep_for(std::chrono::milliseconds(50));	2013-06-26 11:34:04 +08:00
James Chen	8a0046a139	issue #2305: Fixing a crash when error is triggered in WebSocket. Using std::lock_guard to replace lock and unlock manually.	2013-06-26 10:11:10 +08:00
James Chen	3b9fa904ba	issue #2305:use c++11 thread instead of pthread for WebSocket.	2013-06-25 12:51:44 +08:00
James Chen	cb67ed0227	issue #2129: Removing CC prefix for extension module.	2013-06-20 14:15:53 +08:00
Edward Zhou	53be008dcf	fix url parse error for 'ws://domain.com/websocket' pattern	2013-06-17 18:28:12 +08:00
James Chen	a14df8d28d	issue #2271: Fixing some memory leaks.	2013-06-10 11:43:43 +08:00
minggo	81b579c032	issue #2271: fixed memory leak of WebSocket	2013-06-09 14:50:51 +08:00
James Chen	5c8d4378a6	Fixing compilation errors in TestLua for Win32.	2013-06-07 21:23:15 +08:00
samuele3hu	5986d3904d	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind	2013-06-07 10:14:12 +08:00
samuele3hu	66d4acc31a	issue #2103 add webSocket lua test sample	2013-06-07 10:12:01 +08:00
samuele3hu	e4ec801363	issue #2103 add webSocket lua test sample	2013-06-06 22:29:02 +08:00
James Chen	f056757a9f	Adding libwebsockets license in WebSocket.h/.cpp.	2013-06-06 14:16:57 +08:00
James Chen	f2f0f031c7	fixed #1647: Renaming enumerations to Cocos2d-x style. ERROR and ERROR_TIMEOUT is defined as macros on Windows, fuck it.	2013-06-03 09:55:43 +08:00
James Chen	4b8f76c903	WS_ERROR -> ERROR, WS_STATE -> STATE.	2013-06-02 18:56:49 +08:00
James Chen	cedb427a6e	fixed #1647: Adding WebSocket support for Cpp and JSB. ... Conflicts: extensions/proj.win32/libExtensions.vcxproj extensions/proj.win32/libExtensions.vcxproj.filters	2013-06-02 18:55:57 +08:00