byeonggee.seo
a2274162b5
merged
2015-03-12 10:06:53 +09:00
Mazyad Alabduljaleel
983ffd96c7
Now, mac uses ObjC HTTP client
2015-03-10 14:48:57 +04:00
byeonggee.seo
b3335f34ae
Merge branch 'network_bugfix2' of github.com:seobyeongky/cocos2d-x into network_bugfix2
2015-03-03 16:33:48 +09:00
byeonggee.seo
3811c9f1a3
connError added
2015-03-03 16:33:35 +09:00
seobyeongky
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
minggo
7805adce94
Merge pull request #10325 from seobyeongky/httpclient_bugfix
...
HttpResponse reference counting bug fixed
2015-02-27 14:32:41 +08:00
minggo
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
minggo
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
minggo
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
Mazyad Alabduljaleel
23093b9c53
Just a few more leak fixes
2015-02-25 10:56:25 +04:00
Mazyad Alabduljaleel
c80312bea6
Two more memory leaks
2015-02-25 10:52:15 +04:00
Mazyad Alabduljaleel
3e60e0ddf6
For some reason, this is causing a conflict
2015-02-25 10:44:00 +04:00
mogemimi
d384f7ce1e
Fix typo: unkown -> unknown
2015-02-24 02:39:50 +09:00
Mazyad Alabduljaleel
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
Mazyad Alabduljaleel
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
Jongryul Kook
c05dd4357d
Fixed HttpClient-ios request to work when the data is started by 0x00.
2015-02-18 16:51:12 +09:00
Jeff Oh
e33854f3eb
apply custom request header for every request type (ios)
2015-02-12 20:07:19 +09:00
byeonggee.seo
753335726a
receive content data even though status code is not 2xx
2015-02-03 16:28:23 +09:00
byeonggee.seo
23e0320cac
HttpResponse reference counting bug fixed
2015-02-02 12:23:15 +09:00
samuele3hu
fec0d9c41d
Set default value for `Content-Type` of headfield in `PUT` method
2015-01-31 22:15:15 +08:00
samuele3hu
75dc45bfea
Remove useless blank line
2015-01-31 15:21:03 +08:00
samuele3hu
e6d50d7086
Fix the error that the binary data would be truncated
2015-01-31 14:31:24 +08:00
samuele3hu
93665c5c6d
Fix the error that HttpClient didn’t setResponseCode when connecting failed
2015-01-28 13:49:19 +08:00
cpascal
281d231a5d
Fixed inconsistent time-scale in Httpclient.
2015-01-19 10:50:42 +09:00
andyque
fcfcb4fd71
fix websocket dead lock
2015-01-16 18:43:57 +08:00
huangshiwu
12212dc572
fix HttpAsynConnection method didReciveResponse's process error
2015-01-14 14:01:58 +08:00
huangshiwu
108e4d2b41
Add comments and improve code readability for HttpAsynConnection.m
2015-01-08 10:12:45 +08:00
huangshiwu
be02233815
Fix XmlHttpRequestTest parsing error of response header on iOS platform
2015-01-08 00:23:27 +08:00
samuele3hu
c91bd076cb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_bug_xmlhttp
2015-01-04 17:10:22 +08:00
samuele3hu
832a87f5f0
Fix crash on the XmlHttpRequestTest for Lua and parsing error of response headers for HttpURLConnection
2015-01-04 17:09:35 +08:00
minggo
4224319d61
Merge pull request #9775 from huangshiwu/iosnetwork-fixbug
...
fix iOS HttpClient immediately mode's bug
2015-01-04 14:45:18 +08:00
samuele3hu
713de37c5b
Fix compile iOS compile error on the Xcode 5.1.1
2015-01-04 13:49:41 +08:00
huangshiwu
79e3e8463d
fix iOS HttpClient immediately mode's bug
2015-01-04 10:54:29 +08:00
minggo
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
samuele3hu
3795f9cc2a
Rename HttpClient-android.cpp and unify java indent format
2014-12-31 12:03:27 +08:00
huangshiwu
893aded9b7
iOS HttpClient replace libcurl - fix Jenkins compile error
2014-12-31 11:32:35 +08:00
samuele3hu
f7ed73c1e1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_httpclient
2014-12-31 10:17:12 +08:00
samuele3hu
0e94bdda3a
Use android network module — HttpURLConnection to replace the libcurl on the android platform
2014-12-31 10:15:14 +08:00
huangshiwu
7426b5c4b5
iOS HttpClient replace libcurl
2014-12-31 10:02:14 +08:00
minggo
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
Ricardo Quesada
33a2d0451c
Code conforms with the cocos2d-x c++ guidelines
2014-11-25 17:53:52 -08:00
Vladimir Timofeev
33786678eb
Add finding curl. Fix some leftovers from websockets.
2014-11-16 13:55:42 +03:00
Vladimir Timofeev
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
Timothy Zhang
59424c0609
replace tabs with spaces.
2014-10-27 09:53:01 +08:00
Timothy Zhang
6d43d5e11e
avoid locking when message queue is empty in websocket
2014-10-24 19:09:47 +08:00
Dhilan007
ccbc668427
Improve Android.mk
2014-10-17 10:13:33 +08:00
Dale Stammen
fd638f00b7
removed old WP8 project files
2014-10-14 14:09:52 -07:00
martell
73980195c0
wp8: use CC_STATIC because libs are static
2014-10-09 06:33:46 +01:00
martell
c3172bef50
Finalise Windows cmake support for mingw-w64
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:09 +01:00
martell
30240a8a37
Multi platform cmake support
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:21:45 +01:00
Ricardo Quesada
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
Keisuke Kobayashi
c4d2c5eaed
Rename setSSLVerification
2014-09-14 00:28:11 +09:00
Keisuke Kobayashi
6b0879fe93
HttpClient SSL verification
2014-09-13 20:37:36 +09:00
Ricardo Quesada
6f3ca63f00
Moved base/CCPlatform* -> platform/CCPlatform*
2014-09-09 17:17:07 -07:00
Ricardo Quesada
9082ca18c3
Platform fixed
2014-09-09 16:50:02 -07:00
Kezhu Wang
925fb9aa38
bugfix: condition variable sleep on unrelated mutex
2014-09-03 23:56:54 +08:00
minggo
3679d66c8e
remove unneeded includes
2014-08-29 15:39:52 +08:00
minggo
d3ce2acff6
Merge pull request #7892 from Dhilan007/v3-androidmk
...
Adjust android.mk for cocos2d and related module
2014-08-28 10:16:39 +08:00
Ricardo Quesada
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
Dhilan007
bef774a14a
Adjust android.mk for cocos2d and related module
2014-08-27 22:54:28 +08:00
samuele3hu
3d5f8de346
Adjust android.mk for cocos2d and related module
2014-08-27 20:58:32 +08:00
samuele3hu
3759648d3a
Remove the useless aneroid.mk files
2014-08-27 10:21:47 +08:00
samuele3hu
a5a706aa05
Remove the useless win32 project
2014-08-27 10:20:15 +08:00
samuele3hu
74624f5ba1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
2014-08-25 11:52:52 +08:00
minggo
030f80a257
one static library for c++ and another one for lua-binding
2014-08-24 03:52:51 -07:00
samuele3hu
2f60e610a2
Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform
2014-08-22 13:49:21 +08:00
samuele3hu
ada7fa23d3
Add CC_DLL for related network files
2014-08-22 13:42:46 +08:00
minggo
cdd67be77a
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
2014-08-19 15:29:40 +08:00
samuele3hu
cf0aa36c15
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
...
Conflicts:
cocos/network/CMakeLists.txt
cocos/storage/CMakeLists.txt
2014-08-07 14:02:50 +08:00
samuele3hu
aa4f407851
extract ui,network and storage from cocos2d module and adjust relate CMakeLists.txt
2014-08-07 13:53:13 +08:00
martell
75911658aa
Make CMake More Robust
2014-08-06 15:43:19 +01:00
Huabing.Xu
bf287252df
change libnetwork and libSpine
2014-07-29 09:31:52 +08:00
Huabing.Xu
4a4f05c827
change cocos2d to libcocos2d for windows
2014-07-28 20:55:58 +08:00
Huabing.Xu
61ff03ab45
windows cpp-tests works now
2014-07-23 18:34:49 +08:00
Dhilan007
6cff8cb564
fixed warn and replace NULL with nullptr.
2014-07-10 00:45:27 +08:00
minggo
6cc600ccce
fix compiling warnings
2014-07-03 11:43:56 +08:00
lite3
07245ebf6e
put request param in lambda in HttpClient::networkThreadAlone
2014-06-26 02:03:53 +08:00
lite3
e3eb5aeddd
put duplicate code to processResponse
2014-06-22 12:37:23 +08:00
lite3
ebbcb3ea33
change immediateSend to sendImmediate
2014-06-22 11:39:39 +08:00
lite3
cb42f549ce
fix: request will be delete in thread.
2014-06-22 00:08:02 +08:00
lite3
758a1f5dc4
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-06-21 17:34:11 +08:00
zhangbin
ec62f05b12
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-06-20 10:51:13 +08:00
zhangbin
0019d9a061
Optimize the win32 projects configuration.
2014-06-20 10:50:43 +08:00
lite3
77210d60ae
fix: can not create networkThread at second create HttpClient.
2014-06-19 22:07:24 +08:00
John_He
3bf4c5e985
fix mingw32/64 build:
...
MinGW uses system installed libcurl, rather than libcurl_imp.
2014-05-30 19:54:59 +08:00
lite3
ae7c93dd4e
Merge remote-tracking branch 'upstream/v3' into v3
2014-05-29 20:41:00 +08:00
minggo
05df2a4db1
Merge pull request #6657 from asmodehn/asmo_newv3_cmake_win32
...
Fixing cmake project for win32
2014-05-29 15:25:58 +08:00
lite3
dff6b2f338
fix: Incorrect error buffer in two thread
2014-05-23 01:43:32 +08:00
lite3
4679e08c3d
networkThreadAlone callback on main thread use lambda
2014-05-21 15:31:58 +08:00
lite3
ed7ecabe8f
replace tab to space.
2014-05-21 10:44:07 +08:00
lite3
953ca4a44b
Add immediate send request
2014-05-20 20:08:26 +08:00
Ricardo Quesada
0f67247325
Squashed commit of the following:
...
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 08:24:41 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into files
commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 15 19:36:23 2014 -0700
files in the correct directory
2014-05-16 14:36:00 -07:00
AlexV
234c902630
fixing cmakelist after merge
2014-05-15 22:26:41 +09:00
AlexV
d7f1af876a
fixed network link library curl in win32 case : libcurl_imp
2014-05-10 10:07:57 +09:00
Mircea Rila
b66b4c6f1d
upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).
...
remove C4005 warnings after upgrading projects
2014-05-07 17:41:04 +03:00
Ricardo Quesada
32f3fedb37
Moves cocos/2d/Android.mk to cocos/Android.mk
...
Easier to find Android.mk
2014-05-01 14:09:26 -07:00
Ricardo Quesada
25213c81f6
linux cmake improvements
...
Added cocos/CMakeLists.txt
which controls all the rest of the Cmake files
2014-05-01 13:01:51 -07:00
Ricardo Quesada
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
Ricardo Quesada
81c2d92355
yeah... love in includes
...
<3
2014-04-26 10:35:57 -07:00
Ricardo Quesada
9b118e5e96
Squashed commit of the following:
...
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
2014-04-26 10:11:22 -07:00