a03c45ce62
Update network licenses and reformat
2016-05-18 14:29:54 +08:00
948f64631f
Use const references whenever possible
2016-05-17 13:17:56 +09:00
a1a8feed71
Add missing references to avoid unnecessary copies
2016-05-17 01:15:07 +09:00
16878a53b1
Suppress MSVC warning C4800
2016-05-13 11:44:17 +09:00
74af3b5232
merge v3.11 back to v3
2016-05-12 09:50:03 +08:00
85812b4f5b
Remove client_no_context_takeover extension in WebSocket (not working on Android/iOS/Mac)
2016-05-10 20:35:02 +08:00
fd160a1611
remove Content-Type limitation
2016-05-10 18:15:57 +08:00
2df9afbe71
Fix typos in documentation and comments
2016-05-05 08:05:20 +09:00
fcfaafa4a5
Fix SocketIO fail to connect issue on Android
2016-05-04 17:43:36 +08:00
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
a3ad4cddf8
Fix warnings about signed/unsigned mismatch
2016-04-22 12:20:05 +09:00
949112fdc2
Merge pull request #14321 from pandemosth/socketIO_issue_14287
...
Fix SocketIO crash on reconnect
2016-04-21 14:28:21 +08:00
200c9fda59
fix HTTPAsyncConnection bad memory management
...
Removed a redundant release on certDataRef that caused crash on
NSURLConnectionLoader thread.
Fixed a memory leak of SecCertificateRef
This fixes #15464
2016-04-20 14:04:44 +09:00
7f1b02ab92
Merge branch 'fix/ios_downloader_crashes_with_storage_path_containing_spaces' into fix/several_network_bugs
2016-04-20 12:12:31 +09:00
776ee8ac5a
Merge pull request #14843 from cezheng/fix/ios_downloader_crashes_with_storage_path_containing_spaces
...
fix iOS downloader crash when storage path contains spaces
2016-04-19 13:46:02 +08:00
03ad0f01c9
Merge pull request #15001 from mogemimi/refactor-httprequest
...
Refactor HttpRequest and HttpResponse
2016-04-19 11:23:59 +08:00
d1871d1ca7
Refactor HttpRequest and HttpResponse
2016-04-19 02:58:42 +09:00
dc0f7bf903
Fixes format warnings.
2016-04-18 17:52:58 +08:00
6dff5fdc13
std::shared_ptr<bool> -> std::shared_ptr<std::atomic<bool>>
...
The reference count field in shared_ptr is threadsafe but the value field is not. So we need to wrap a std::atomic for preventing potential thread racing.
2016-04-07 15:06:19 +08:00
6b167a1aa1
Merge pull request #15335 from mogemimi/fix-typos
...
Fix typos in comments and strings
2016-04-06 11:32:46 +08:00
3d7d5de95d
Merge pull request #15317 from pandamicro/v3
...
Fix Socket IO handshake issue with latest version libwebsocket
2016-04-01 22:27:57 +08:00
d93fbea0f6
Fix Socket IO connection issue on iOS
2016-03-31 21:21:20 +08:00
44080a04d8
Fix typos in comments and strings
2016-03-29 10:52:17 +09:00
7e87b8b389
Fix Socket IO handshake issue with latest version libwebsocket
2016-03-25 17:13:28 +08:00
32e408487f
Fixes import path for m and mm files.
2016-03-21 20:12:58 +08:00
931d56bc10
Fixes includes in .m and .mm files.
2016-03-21 11:02:00 +08:00
90456d29ba
Fixes 1605 include path in 541 files
...
using the tools/coding-style/include-linter.py with -f options.
2016-03-20 21:53:44 +08:00
9477bfd801
Merge pull request #15135 from dumganhar/ws-close-fix
...
Closes websocket connection by dispatching a 'resetDirector' event.
2016-03-10 17:39:47 -08:00
3a87ee46c6
Fix compiler warning: "/* within block comment"
2016-03-03 10:44:51 +09:00
028f8c28e1
Squashed commit of the following:
...
commit 59e43a3c80f4af8998e4a14f6463bd7a91617d5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 15:19:48 2016 -0800
uses new naming convention for projects
uses _ instead of -
commit f97ba56608d48b17909649c8617ba9047b566196
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:49:22 2016 -0800
fooling cmake for real
commit 20c2560f75eab952e5131b484284bf20cb07fe07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:43:05 2016 -0800
fooling cmake
commit a0ada44bc82941830f6c71219a1492d28c28c306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:26:59 2016 -0800
makes CMake for Mac happy
commit 656b4f5e2dd741215a4699db979fe1b0dce60298
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 13:50:15 2016 -0800
linux fix
commit fa98aeac8505c764f4a69f15c8a8ff1123fad2a3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 11:18:18 2016 -0800
links correctly!
commit 9c56ce7143d3a35b44d33f246cec093ca9eaa7d9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Mar 1 17:44:58 2016 -0800
Squashed commit of the following:
commit 2ef52723dae44204c047cb177d5a5670fb659c79
Merge: 8a5c998 25cf1f1
2016-03-02 16:51:54 -08:00
037051d9c4
Closes websocket connection by dispatching a 'resetDirector' event.
2016-02-29 18:55:51 +08:00
7d43e35741
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into refactor-websocket
2016-02-17 14:56:32 +08:00
44d2a161dc
Remove unnecessary c_str() calls
2016-02-04 11:52:14 +09:00
7dd7dfede7
Replace char* with std::string in HttpRequest
2016-01-26 05:13:18 +09:00
28a3f78c65
Adds missing <mutex>, <memory> include files in WebSocket.h
2016-01-22 18:10:24 +08:00
b73b16d425
Adds isDestroy std::share_ptr variable to dectect whether websocket instance was destroyed.
2016-01-22 17:43:30 +08:00
c3e0edde06
'closed' state has to be set before quit websocket thread.
2016-01-22 16:10:49 +08:00
a64a789308
_readyState must be set to State::CLOSED and _delegate->onClose(this) must be invoked at the end of WebSocket::close.
2016-01-22 15:20:43 +08:00
ed9ed6c92f
Don't change the behavior of WebSocket::close method. WebSocket::close is an synchronous method before, adds a WebSocket::closeAsync method for asynchronous closing.
2016-01-22 14:22:33 +08:00
f0066d03d7
whitespace cleanup.
2016-01-13 21:15:48 +08:00
dacd51c839
More function name renames. createThread -> createWebSocket, quitSubThread -> quitWebSocketThread.
2016-01-13 21:15:48 +08:00
649ed67371
Removes lws_get_internal_extensions, adds permessage-deflate extension.
2016-01-13 21:15:48 +08:00
fc38857e6b
LWS_SEND_BUFFER_PRE_PADDING -> LWS_PRE
2016-01-13 21:15:48 +08:00
5d1e98340e
Updates WebSocket::onSocketCallback & WebSocketTest.js
2016-01-13 21:15:48 +08:00
2b5fde79e0
Comment fix & function name fix for WsThreadHelper:
...
sendMessageToUIThread -> sendMessageToCocosThread
sendMessageToSubThread -> sendMessageToWebSocketThread
joinSubThread -> joinWebSocketThread
2016-01-13 21:15:48 +08:00
d122784ad4
Adds WebSocket::closeAllConnections() method.
2016-01-13 21:15:48 +08:00
f9e8ae0f09
WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test).
2016-01-13 21:14:38 +08:00
41dd44c75d
Fix some typos in docs
2016-01-11 19:23:05 +09:00
ab0efd933a
Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
CHANGELOG
cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
2016-01-09 18:01:56 +08:00
963efe78fe
fix iOS downloader crash when storage path contains spaces
2016-01-07 16:58:16 +09:00
168e851cce
Fixed WebSocket may automatically disconnected if invoke `send` several times in quick succession on Android.
2015-12-31 10:42:06 +08:00
022bcc24f1
Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
2015-12-20 22:56:33 +08:00
8d967982cd
Merge pull request #14723 from newnon/v3.10_web_socket_crash_fix
...
fix web socket crash
2015-12-19 10:11:58 +08:00
b4f762befa
fix include in cocos network module
2015-12-17 11:50:54 +03:00
a172cce874
fix web socket crash
2015-12-17 11:48:25 +03:00
58902f0711
Fix issue in URLSession:task:didCompleteWithError:
2015-12-16 21:19:46 +08:00
ffcf45ef78
Improved solution for Downloader status code issue on iOS 9
2015-12-16 17:45:40 +08:00
7303895866
Improve error message for Downloader and add test case
2015-12-16 15:43:18 +08:00
4fa58602a8
Adds `std::nothrow` to the `new` statements
2015-12-16 14:02:55 +08:00
6d58fc05d9
Fix Downloader callback bug on iOS9
...
On iOS 9 when server returns a response with HTTP status 403 caused the
downloader to callback successfully and saving the error message to the
storage path. This commit adds a check on the HTTP status code and
do failure callback if status code is 4xx or 5xx.
2015-12-15 13:16:24 +09:00
91909081da
Merge pull request #14542 from pandemosth/issue_14539
...
Fix for Issue 14539
2015-12-03 18:47:17 +08:00
ef931b61af
correct typo in method name of doDestroy
2015-12-02 15:23:05 +11:00
528a94d36f
fixes a crash in destructor of CCDownloader-apple when completing a data download
2015-12-02 15:21:42 +11:00
151e7a7a53
CCDownloader-apple : call onTaskFinish when the download session completes for a data task
2015-12-02 15:16:00 +11:00
ecf94a3dc4
Add a buffer queue to iOS Downloader
...
Upon calling NSURLSessionDownloadTask's resume, the task's timeout
countdown starts. When the AssetManagerEx starts downloading, it creates
all the tasks all at once and just `resume` upon creation. When the
number of asset files is very large, later tasks tend to end up in
'request timed out -1001' error before they can even start downloading.
This commit adds a buffer queue to prevent all the NSURLSessionTasks to
start all at once.
2015-12-01 17:24:26 +09:00
d174a98afa
Add a buffer queue for Android Downloader to prevent out of memory
...
When the AssetManagerEx start downloading, it used to create all the
download tasks all at once. When the app has a large number of asset
files, it is likely to crash due to out of memory when creating
threads for each of the download tasks. This commit adds a buffer
queue to the downloader to use the `countOfMaxProcessingTasks`
property from hints, preventing all the tasks from starting all at once.
2015-12-01 16:25:50 +09:00
23f27534f6
Solve a possible memory leak in HttpRequest
2015-11-25 14:03:56 +08:00
0b5a3465bc
Remove duplicated code by introduce a private doSetResponseCallback.
2015-11-18 17:52:24 +08:00
b33aa00109
Fixes boring deprecated warning.
...
I know I duplicated the code but there is no cpp for me to move body into.
2015-11-18 17:47:07 +08:00
e3c120eef4
Combine Studio change for compatible with 32 bit Mac System
2015-11-16 18:25:26 +08:00
139d8b5310
Remove unused code
2015-11-06 10:10:09 +08:00
1a56668cd3
Fix "TextureCache Test" in js-test crash under Android
2015-11-06 09:49:19 +08:00
a4c4c64069
cleanup SIOClientImpl when an unexpected close happens
2015-11-05 13:08:33 +11:00
9df30d2454
Fix typos in documentation
2015-10-23 16:59:51 +09:00
6beb982665
Adjust code execute order, used a simple and safe way to avoid access fail bug.
2015-10-22 14:36:26 +08:00
7e54a91ee6
Fix CCDownloader-curl will crash in js-test
...
Fix broken image link in TextureCacheTest.js
2015-10-20 16:28:03 +08:00
5993304e06
Fix typos
2015-10-09 17:59:11 +09:00
4cfe139991
Fixing SocketIO - Connect failed after Disconnected
...
Fixes for issue: https://github.com/cocos2d/cocos2d-x/issues/14077
2015-10-06 13:21:22 +06:30
548fc94eb8
added missing std includes
2015-10-02 18:17:11 -07:00
bd7f90f993
adds initializing value and corrects spelling of variable _endpointseparator
...
Signed-off-by: Chris Hannon <chris@channon.us>
2015-09-19 20:47:54 -04:00
e7c2436d85
fixes bug in socketio extension when connecting to socketio servers v1+ (incorrect separator in v1 packet strings)
...
Signed-off-by: Chris Hannon <chris@channon.us>
2015-09-19 20:31:48 -04:00
5eafc93d86
Remove AssetsManager dependence with CRUL.
2015-09-17 16:52:31 +08:00
ea585f4b7d
Fix compile problems.
2015-09-16 09:34:24 +08:00
848fa2c0d0
Merge cocos2d.
2015-09-15 18:30:45 +08:00
bf477c6bfb
Restructure AssetsManagerEx.
2015-09-15 11:23:46 +08:00
ebf308d88c
Test case Downloader Test restructured.
2015-09-14 15:33:34 +08:00
bd80eb6f46
CCDownloader-android implements Data Task Download.
2015-09-10 18:03:15 +08:00
7e2fe05050
CCDownloader-android implements File Task Download.
2015-09-10 15:56:06 +08:00
941cd3c9de
Merge pull request #13717 from jianglong0156/assetsmanagerContinue
...
fix the AssetsManagerEx can not continuous transmission
2015-09-10 11:34:03 +08:00
d6934cfc4b
rename var resumeDownloaded to resumeDownloaded.
2015-09-08 16:38:02 +08:00
8daf026c6c
fix the AssetsManagerEx can not continuous transmission for large zip file.
...
the testcase is extension/assetsmanager
2015-09-08 16:34:02 +08:00
bbe5861367
fix crash on xiaomi2 if cocos2d-x is built as a dynamic library
2015-09-08 10:26:37 +08:00
9b4fe5b5a1
Add CCDownloader-android class frame to android project.
2015-09-07 11:55:00 +08:00
3a078540a0
Modify CCDownloader-apple.mm support continuly download.
2015-09-07 10:08:28 +08:00
0afa2bdfc6
Modify CCDownloader-curl.cpp to support continue download.
2015-09-06 15:57:51 +08:00
ea580ed2ee
Restructure CCDownload Interface and implements with curl.
2015-09-02 18:26:42 +08:00
cf664800ac
refine #22483 : Restructure CCDownload Interface and implements on iOS.
2015-08-28 16:40:11 +08:00
055ef23931
Fix AssetsManager crash by protecting Downloader with shared_ptr
2015-08-22 22:13:53 +08:00
895c29efe4
fix texturecache didn't show correctly in win32
2015-08-20 18:11:05 +08:00
b4f585732e
Add CCDownloader-apple for mac and ios.
2015-08-20 11:35:40 +08:00
5baa90c79e
libcurl.h not included in the header to avoid...
...
too many dependencies
2015-08-13 19:28:38 -07:00
d2cf4bfc79
Squashed commit of the following:
...
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf5e21580#6 from minggo/downloader_decouple
fix js binding error
commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date: Thu Aug 13 11:09:58 2015 +0800
fix js binding error
commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8#5 from minggo/downloader_decouple
fix lua-binding error
commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date: Wed Aug 12 10:34:05 2015 +0800
fix lua-binding error
commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a#4 from minggo/downloader_decouple
fix linking error in lua-tests on Android
commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date: Tue Aug 11 16:23:53 2015 +0800
fix link error in lua-tests
commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 23:22:50 2015 -0700
works for real on win32
commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 22:26:59 2015 -0700
compiles on win32
commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:57:49 2015 -0700
compiles on iOS!!
commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:27:03 2015 -0700
compiles and runs Ok on windows.
Tested all downloadertests + assetmanagertest
commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 20:24:28 2015 -0700
updates windows projects
commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 19:56:10 2015 -0700
compiles on Android
commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:34:33 2015 -0700
trying to fix a compile issue on iOS
WIP
commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:25:11 2015 -0700
make bug fixes
adds public `getHeader`
commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 17:42:19 2015 -0700
some linux fixes
commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:58:53 2015 -0700
Squashed commit of the following:
commit 86227e9138c1fb523bd28186d355de65cc64c588
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:55:17 2015 -0700
works %100
and uses less memory than before
commit a9cafa6f2fe7847e279934d2c162287680760dda
Merge: 0bbc62e 0cbd71f7f215e90d778386831e24a06421b8d836daf744383253d9c4642ccac
2015-08-13 00:14:10 -07:00
47fe470647
Merge pull request #13213 from jianglong0156/improUtfFunction
...
add api getStringUTFCharsJNI newStringUTFJNI
2015-08-05 17:26:52 +08:00
fac7a78fc8
improve getUTFCharsFromJavaEnv api to getStringUTFCharsJNI and add newStringUTFJNI
...
getUTFCharsFromJavaEnv:
getUTFCharsFromJavaEnv:change jstring to utf8 std string
newStringUTFJNI:change utf8 std string to jstring
2015-08-05 16:10:14 +08:00
8cdcade07a
Merge pull request #13186 from jianglong0156/addEmotionTest
...
fix getStringUTFChars bug
2015-08-05 10:19:19 +08:00
3230ca154d
improve the code. fix network error
2015-08-04 16:42:16 +08:00
00b7e98c89
improve the getUTFCharsFromJavaEnv logic and fix the httpclient response message memery leak.
2015-08-04 16:24:08 +08:00
979700e343
there is a bug for getStringUTFChars function. it can't translate the emotion utf8 code. so change the getStringUTFChars to getStringChars. and translate unicode to utf8 in c++ program
2015-08-04 11:30:30 +08:00
f10994c20b
Merge pull request #12467 from MagicTavern/v3_fix_websocket
...
fix a problem where WebSocket messages may pile up
2015-08-03 16:25:56 +08:00
2c5e2db6b4
refine NSLog in HttpAsynConnection in release mode.
2015-07-17 14:23:51 +08:00
7243f2cff5
add const & to string arguments
2015-07-09 11:23:20 +08:00
d4066a5ff8
improve coding style of Socket.IO
2015-07-08 17:23:48 +08:00
155ac8c07e
Merge pull request #11583 from hannon235/v3-update-sio
...
Updates socket.io network extension to correctly detect and manage connection to socket.io server versions 0.9.x - 1.x
2015-07-08 16:11:05 +08:00
507f221483
fix a problem where WebSocket messages will pile up if server sends them faster than client's frame rate
2015-06-22 20:58:37 +08:00
5ee22c4142
Merge pull request #12174 from pajeroquan/v3
...
Fix JNI object memory leak!
2015-06-17 15:14:36 +08:00
d0db40c4a6
Merge pull request #12080 from linshun/v3
...
issue #12078 added audio, network, physics, platform and storage group.
2015-06-15 12:45:11 +08:00
fa71a6e352
Merge pull request #12204 from jianglong0156/issue1756
...
default support curl gzip. and add the gzip test in xmlhttprequest Issue1756
2015-06-05 13:17:53 +08:00
8d011fd457
formate the space
2015-06-05 11:45:05 +08:00
956101bb72
Fix JNI object memory leak!
...
Fix JNI object memory leak!
2015-06-04 11:54:53 +08:00
574cfb4ade
Merge branch 'v3-update-sio' of https://github.com/hannon235/cocos2d-x into merge-up
...
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
Conflicts:
cocos/network/SocketIO.cpp
2015-06-02 21:11:43 -04:00
fe6275adf5
[v3-update-sio] fixes nested switch brackets - best practice would be to replace these with functions in the future
...
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2015-06-02 20:17:34 -04:00
6bcf325630
[v3-update-sio] updates usage of log function to CCLOG macros, ensures correct data type is passed to log function
...
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2015-06-02 20:17:34 -04:00
5af28838d2
[v3-update-sio] updates SocketIO network extension to support v1.x socket.io servers as well as maintain backwards compat. for 0.9.x servers
...
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2015-06-02 20:17:33 -04:00
97d0265e32
gzip test
2015-06-02 10:23:30 +08:00
40ea6e3e41
Merge pull request #12103 from samuele3hu/v3_http_leak
...
Fix the memory leak of HttpClient on the iOS/Mac platform.
2015-06-02 10:11:03 +08:00
ae6cb678c6
Fix the memory leak of HttpClient on the iOS/Mac platform.
2015-05-29 17:13:49 +08:00
60f672599b
added winrt networking files
2015-05-28 13:48:13 -07:00
2a02510a9c
issue #12078 : Added network group.
2015-05-28 15:46:36 +08:00
27e7101322
fix the memory leak of s_requestSentinel for httpclient and adjust the global static var into the object to avoid some unexpected result.
2015-05-22 10:47:52 +08:00
461241839d
Fixed compile error on visual studio 2015.
2015-05-12 17:04:56 +08:00
351a898a70
removed CC_PLATFORM_WP8
2015-05-08 09:19:13 -07:00
25a9c90b54
Fix android http client memory leak
2015-04-26 20:52:09 +09:00
da74d1be93
[v3-update-sio] updates usage of log function to CCLOG macros, ensures correct data type is passed to log function
...
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2015-04-24 00:17:43 -04:00
e1923f3dbf
[v3-update-sio] updates SocketIO network extension to support v1.x socket.io servers as well as maintain backwards compat. for 0.9.x servers
...
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2015-04-24 00:17:43 -04:00
ff3777dfd1
[ci skip]Update comments.
2015-03-27 18:26:14 +08:00
f54512a618
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_comment
2015-03-27 15:59:05 +08:00
bb225d052e
Update comments of some header files
2015-03-27 15:27:08 +08:00
a47cad0354
[ci skip]Fixed warnings
2015-03-27 11:59:10 +08:00
a1b054911c
Update comments of some header files
2015-03-27 11:13:28 +08:00
e0bde0f789
Update comments of some header files
2015-03-26 22:07:44 +08:00
9dd778edb0
[ci skip]Update comments
2015-03-24 20:23:51 +08:00
8e32933dd3
Merge pull request #10340 from seobyeongky/network_bugfix2
...
receive content data even though status code is not 2xx
2015-03-19 21:12:51 +08:00
1eb1057875
Update comments of some header files
2015-03-19 16:59:21 +08:00
31b34ddf77
Update comments of some header files
2015-03-19 16:45:53 +08:00
a2274162b5
merged
2015-03-12 10:06:53 +09:00
983ffd96c7
Now, mac uses ObjC HTTP client
2015-03-10 14:48:57 +04:00
b3335f34ae
Merge branch 'network_bugfix2' of github.com:seobyeongky/cocos2d-x into network_bugfix2
2015-03-03 16:33:48 +09:00
3811c9f1a3
connError added
2015-03-03 16:33:35 +09:00
91b0104fd0
Fix an issue with iOS HTTP Request code ( https://github.com/cocos2d/cocos2d-x/pull/10543 )
2015-02-27 21:31:33 +09:00
7805adce94
Merge pull request #10325 from seobyeongky/httpclient_bugfix
...
HttpResponse reference counting bug fixed
2015-02-27 14:32:41 +08:00
e69e648d7c
Merge pull request #10483 from redism/ios-network-header-fix
...
apply custom request header for every request type (ios)
2015-02-26 16:40:12 +08:00
e37bbee1c2
Merge pull request #10545 from Mazyod/ios-http-request-leaks
...
Fix major memory leaks in iOS http request
2015-02-26 15:41:10 +08:00
31e8d0dccd
Merge pull request #10521 from ryule/fix_httpclient-ios
...
Fixed HttpClient-ios request to work when the data is started by 0x00.
2015-02-26 10:32:20 +08:00
23093b9c53
Just a few more leak fixes
2015-02-25 10:56:25 +04:00
c80312bea6
Two more memory leaks
2015-02-25 10:52:15 +04:00
3e60e0ddf6
For some reason, this is causing a conflict
2015-02-25 10:44:00 +04:00
d384f7ce1e
Fix typo: unkown -> unknown
2015-02-24 02:39:50 +09:00
839f1a851d
One more memory leak fix:
...
When you get the allHeaderFields, the net retain count is 0, because it is autoreleased.
Then, a copy message is issued +1
After that the property itself retains it +1
Total = 2, released once in the dealloc -> leak.
2015-02-23 11:52:49 +04:00
a2f9956d00
Fix major memory leaks in iOS http request
...
... and other small fixes
Brief:
1. In iOS, whenever you have a new spawned thread with its own run loop (i.e. while true), you must wrap it with an autorelease pool, so it cleans up the objects at the end of each loop cycle.
2. There were a few "alloc" and "new" objects that weren't released.
3. The HttpAsync class itself was missing dealloc, also property assignment should use `self.property` so the previous value gets released as appropriate.
4. Resolved a small warning
**NOTE**: I have a cocos2d-x game that heavily relies on the HTTP requests, with cookies, but without SSL, so I couldn't test the SSL.
I haven't tested the cookies and SSL yet, but for starters, these improvements are meant to fix the memory issues only, not the logic.
2015-02-23 10:38:33 +04:00
c05dd4357d
Fixed HttpClient-ios request to work when the data is started by 0x00.
2015-02-18 16:51:12 +09:00
e33854f3eb
apply custom request header for every request type (ios)
2015-02-12 20:07:19 +09:00
753335726a
receive content data even though status code is not 2xx
2015-02-03 16:28:23 +09:00
23e0320cac
HttpResponse reference counting bug fixed
2015-02-02 12:23:15 +09:00
fec0d9c41d
Set default value for `Content-Type` of headfield in `PUT` method
2015-01-31 22:15:15 +08:00
75dc45bfea
Remove useless blank line
2015-01-31 15:21:03 +08:00
e6d50d7086
Fix the error that the binary data would be truncated
2015-01-31 14:31:24 +08:00
93665c5c6d
Fix the error that HttpClient didn’t setResponseCode when connecting failed
2015-01-28 13:49:19 +08:00
281d231a5d
Fixed inconsistent time-scale in Httpclient.
2015-01-19 10:50:42 +09:00
fcfcb4fd71
fix websocket dead lock
2015-01-16 18:43:57 +08:00
12212dc572
fix HttpAsynConnection method didReciveResponse's process error
2015-01-14 14:01:58 +08:00
108e4d2b41
Add comments and improve code readability for HttpAsynConnection.m
2015-01-08 10:12:45 +08:00
be02233815
Fix XmlHttpRequestTest parsing error of response header on iOS platform
2015-01-08 00:23:27 +08:00
c91bd076cb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_bug_xmlhttp
2015-01-04 17:10:22 +08:00
832a87f5f0
Fix crash on the XmlHttpRequestTest for Lua and parsing error of response headers for HttpURLConnection
2015-01-04 17:09:35 +08:00
4224319d61
Merge pull request #9775 from huangshiwu/iosnetwork-fixbug
...
fix iOS HttpClient immediately mode's bug
2015-01-04 14:45:18 +08:00
713de37c5b
Fix compile iOS compile error on the Xcode 5.1.1
2015-01-04 13:49:41 +08:00
79e3e8463d
fix iOS HttpClient immediately mode's bug
2015-01-04 10:54:29 +08:00
161b0a3985
Merge pull request #9727 from samuele3hu/v3_4_httpclient
...
Use android network module — HttpURLConnection to replace the libcurl on the android platform
2014-12-31 13:00:04 +08:00
3795f9cc2a
Rename HttpClient-android.cpp and unify java indent format
2014-12-31 12:03:27 +08:00
893aded9b7
iOS HttpClient replace libcurl - fix Jenkins compile error
2014-12-31 11:32:35 +08:00
f7ed73c1e1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_httpclient
2014-12-31 10:17:12 +08:00
0e94bdda3a
Use android network module — HttpURLConnection to replace the libcurl on the android platform
2014-12-31 10:15:14 +08:00
7426b5c4b5
iOS HttpClient replace libcurl
2014-12-31 10:02:14 +08:00
2ec85f8c4e
Merge pull request #8922 from TimothyZhang/do-not-lock-when-no-message-in-websocket
...
avoid locking when message queue is empty in websocket
2014-12-25 14:09:35 +08:00
33a2d0451c
Code conforms with the cocos2d-x c++ guidelines
2014-11-25 17:53:52 -08:00
33786678eb
Add finding curl. Fix some leftovers from websockets.
2014-11-16 13:55:42 +03:00
2835b094da
Cleanup order of fields initialization.
...
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
2014-10-30 17:28:41 +03:00
59424c0609
replace tabs with spaces.
2014-10-27 09:53:01 +08:00
6d43d5e11e
avoid locking when message queue is empty in websocket
2014-10-24 19:09:47 +08:00
ccbc668427
Improve Android.mk
2014-10-17 10:13:33 +08:00
fd638f00b7
removed old WP8 project files
2014-10-14 14:09:52 -07:00
73980195c0
wp8: use CC_STATIC because libs are static
2014-10-09 06:33:46 +01:00
c3172bef50
Finalise Windows cmake support for mingw-w64
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:09 +01:00
30240a8a37
Multi platform cmake support
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:21:45 +01:00
342d934a0e
scheduler and macro fixes
...
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)
Updates all smaples
2014-10-03 09:38:36 -07:00
c4d2c5eaed
Rename setSSLVerification
2014-09-14 00:28:11 +09:00
6b0879fe93
HttpClient SSL verification
2014-09-13 20:37:36 +09:00
6f3ca63f00
Moved base/CCPlatform* -> platform/CCPlatform*
2014-09-09 17:17:07 -07:00
9082ca18c3
Platform fixed
2014-09-09 16:50:02 -07:00
925fb9aa38
bugfix: condition variable sleep on unrelated mutex
2014-09-03 23:56:54 +08:00
pandamicro