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
ea36707c57
issue #2305 : Using the old logic of "wait".
2013-06-26 11:10:19 +08:00
3ad11cc63a
issue #2305 : Fixing a bug that passing wrong mutex parameter to "wait".
2013-06-26 11:06:13 +08:00
f2ab73c533
issue #2305 : Reverting to use lock and unlock for HttpClient.
2013-06-26 10:45:46 +08:00
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
79962cdf5d
issue #2305 : Using c++11 std::thread instead of pthread for HttpClient class.
2013-06-26 10:11:10 +08:00
3b9fa904ba
issue #2305:use c++11 thread instead of pthread for WebSocket.
2013-06-25 12:51:44 +08:00
cb67ed0227
issue #2129 : Removing CC prefix for extension module.
2013-06-20 14:15:53 +08:00
1ea7fd2594
Merge pull request #2904 from edwardzhou/master
...
closed #2312 : WebSocket url parse error for 'ws://domain.com/websocket' pattern
2013-06-19 05:04:11 -07:00
53be008dcf
fix url parse error for 'ws://domain.com/websocket' pattern
2013-06-17 18:28:12 +08:00
c0d44cb2e4
fixed #2129 : Rename m_iVar to _var, remove CC prefixes.
2013-06-15 14:03:30 +08:00
a14df8d28d
issue #2271 : Fixing some memory leaks.
2013-06-10 11:43:43 +08:00
81b579c032
issue #2271 : fixed memory leak of WebSocket
2013-06-09 14:50:51 +08:00
5c8d4378a6
Fixing compilation errors in TestLua for Win32.
2013-06-07 21:23:15 +08:00
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
66d4acc31a
issue #2103 add webSocket lua test sample
2013-06-07 10:12:01 +08:00
e4ec801363
issue #2103 add webSocket lua test sample
2013-06-06 22:29:02 +08:00
f056757a9f
Adding libwebsockets license in WebSocket.h/.cpp.
2013-06-06 14:16:57 +08:00
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
4b8f76c903
WS_ERROR -> ERROR, WS_STATE -> STATE.
2013-06-02 18:56:49 +08:00
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
ad340f0a32
fixed #2092 : Make some function static.
2013-05-20 18:11:55 +08:00
af655ce965
fixed #2092 : #define httpresponse_selector(_SELECTOR) (SEL_HttpResponse)(&_SELECTOR) --> #define httpresponse_selector(_SELECTOR) (cocos2d::extension::SEL_HttpResponse)(&_SELECTOR).
2013-05-20 17:48:21 +08:00
354a8408f6
Added getter and setter for raw header data
2013-05-13 16:57:07 +02:00
7a472f7f5d
Moving CC_DEPRECATED_ATTRIBUTE to the front of functions in HttpRequest.h
2013-05-08 11:32:09 +08:00
912905054e
fixed #2123 : Refactoring network extension, fixing unlikely memory leaks, adding PUT/DELETE methods.
...
Merge branch 'curl_raii' of https://github.com/sergey-shambir/cocos2d-x into sergey-shambir-curl_raii
Conflicts:
extensions/network/HttpClient.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp
2013-05-07 15:37:25 +08:00
a9aafdafac
Merge pull request #2490 from coolengineer/pull-request-httpclient
...
fixed #2119 : Introduce HttpResponse callback selector type to resolve #2365 , fixed version ;-)
2013-05-06 23:44:20 -07:00
a9ace2505e
Introduce HttpResponse callback selector type. to resolve #2365
2013-04-28 03:55:58 +09:00
3bd67a47fa
Fixed crash in HttpClient request on 64Bit
...
According to the cURL documentation the pointer that should be passed
to curl_easy_getinfo with CURLINFO_RESPONSE_CODE must be a long
pointer,
On platforms where long is 64Bit this will cause a stack corruption
destroying the pointer to the original resonse as the current response
code variable was a 32 Bit int value.
See: http://curl.haxx.se/libcurl/c/curl_easy_getinfo.html
2013-04-27 17:55:07 +02:00
43615fe0a7
don't use named semaphore in HttpClient
...
this patch removes using named semaphores for Http requests.
This also destroys the mutexes from CCTextureCache when the thread is
destroyed
2013-04-27 17:44:33 +02:00
8507f7a386
network: Added PUT and DELETE request types
2013-04-21 20:54:52 +04:00
270eeb4d9a
Refactored and fixed almost impossible memory leak.
...
Previously curl_slist_free_all(cHeaders) called in loop after
many break statements, so there was no garantue that it will be called
in all cases.
This change also simplifies code to make implementing PUT/DELETE methods
easier.
2013-04-21 18:58:35 +04:00
18a345071a
Merge pull request #2375 from billy1380/master
...
fix for issue #2366
2013-04-17 01:48:34 -07:00
16b9506690
fixed a bug that was causing http client to fail on mac os x with
...
semaphore error
2013-04-15 22:49:29 +01:00
04c1a863a0
Remove tailing newlines from CCLog messaages.
...
Some CCLog message contained trailing newlines which
made the logs hard to read on many platforms. The solution
here is to stip trailing newlines on those platforms, and also
to remove the newlines from the existing log messages.
2013-03-16 09:01:21 -07:00
38878b084b
Fix all compiler warnings produced by gcc.
...
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
2013-03-05 17:01:00 -08:00
c0ecad31fe
Consistent use of CCAssert
...
* Remove @
* Use CCAssert instead of CC_ASSERT (number of parameters differ between the two)
2013-01-08 14:11:34 -08:00
0f2d8f8c6b
fix the doxygen warnings
...
cocos2d-x.git/extensions/network/HttpClient.h:64: warning: The following parameters of cocos2d::extension::CCHttpClient::setTimeoutForConnect(int value) are not documented:
parameter 'value'
cocos2d-x.git/extensions/network/HttpClient.h:79: warning: argument 'timeout' of command @param is not found in the argument list of CCHttpClient::setTimeoutForRead(int value)
cocos2d-x.git/extensions/network/HttpClient.h:79: warning: The following parameters of cocos2d::extension::CCHttpClient::setTimeoutForRead(int value) are not documented:
parameter 'value'
2012-11-25 23:27:29 +08:00
a09367ca7e
Merge pull request #1491 from sburavtsov/HttpClient-destroy-fix
...
Fix for correct unscheduling and instance destruction
2012-10-25 02:05:34 -07:00
0b381357b0
Fix for correct unscheduling and instance destruction
2012-10-24 03:33:17 +04:00
f1d9629404
Merge pull request #1361 from ncrothe/gles20
...
add the capability to set custom http header to HttpClient
2012-10-08 01:06:39 -07:00
a413496a1a
Delete 'cocos2d::' since extension is the sub-namespace of cocos2d.
2012-09-24 11:08:10 +08:00
b3f5a04ad4
Update extensions/network/HttpClient.cpp
...
Added custom header capability to http wrapper (using curl features). This allows setting non-default content-type for POSTs.
2012-09-22 17:52:04 +03:00
7b9c15176e
Update extensions/network/HttpRequest.h
2012-09-22 17:45:02 +03:00
befaf686bb
Merge pull request #1352 from sburavtsov/HttpClientFix-FOLLOW_LOCATION
...
To be able to handle 302 redirects with curl we need to set option CURLOPT_FOLLOWLOCATION
2012-09-20 18:20:46 -07:00
5128f0e1a8
To be able to handle 302 redirects with curl we need to set option CURLOPT_FOLLOWLOCATION
2012-09-20 19:51:04 +04:00
0cd3552ef7
fixed #1475 , use vector::insert instead of vector::clear + assign in CCHttpClient::writeData, to prevent losing data
2012-09-10 23:17:16 +08:00
7c4ad685e5
add comment for a potential bug in HttpClient.cpp
2012-09-09 18:25:02 +08:00
3ff21fe275
fixed #1424 : http wrapper compiled ok on win32.
2012-08-09 17:04:55 +08:00
9d6e37cf73
issue #1424 , rename "Network" to "network"
2012-08-09 11:44:24 +08:00
James Chen