176 Commits

Author SHA1 Message Date
melo.yao
f02dc689fc Merge branch 'master' of https://github.com/socketio/socket.io-client-cpp 1.6.1 2015-09-20 18:43:46 +08:00
melo.yao
3d0ac441dc add null message type, fix crash when null message cames 2015-09-20 18:43:09 +08:00
melode11
3aee49c553 Merge pull request #59 from macq-vraman/ack_javascript_compliant
Changed ack from message::ptr to message::list
2015-09-10 15:34:07 +08:00
melode11
34b949e24f Merge pull request #57 from macq-vraman/master
Add options to choose between static and dynamic libraries
2015-09-10 15:25:20 +08:00
Vincent Raman
7dc236e160 Proper soname for dynamic libraries 2015-09-06 00:49:54 +02:00
Vincent Raman
3500e7b6d2 Adapted QT demo to ack change 2015-09-04 20:41:22 +02:00
Vincent Raman
df7638e23f Adapt IOS example to ack change 2015-09-04 20:40:58 +02:00
Vincent Raman
b0131a43fa Adapt console example to ack change 2015-09-04 20:40:31 +02:00
Vincent Raman
646bbe0461 Changed ack from message::ptr to message::list 2015-09-04 19:55:03 +02:00
Vincent Raman
dc045baffe Add options to choose between static and dynamic libraries 2015-09-03 17:54:47 +02:00
melo.yao
bbbc1e32dd add boolean message type, fix crash of a synchronization bug 1.6.0 2015-08-25 11:04:14 +08:00
melode11
9d85d3e3b9 Merge pull request #44 from hfossli/patch-2
Add more description about iOS
2015-07-22 10:29:57 +08:00
melode11
ced36025c7 Merge pull request #42 from francoisvdv/master
Use boost::lexical_cast instead of std::stoi for Android compatibility.
2015-07-22 10:24:37 +08:00
Håvard Fossli
92204d628e Update README.md 2015-07-21 10:16:43 +02:00
Francois van der Ven
a32f1ec8c4 Use boost::lexical_cast instead of std::stoi for Android compatibility. 2015-07-19 14:35:24 +02:00
melode11
80b238010b Merge pull request #39 from hfossli/patch-1
Update README.md
2015-07-17 23:56:45 +08:00
Håvard Fossli
9edb2f2a86 Update README.md
Seems like a typo to me
2015-07-14 09:32:53 +02:00
melode11
ccdd0c5bcc Merge pull request #29 from pkwong4321/master
Skip LOG in ping, fix heap error, fix #30
2015-06-25 23:13:52 +08:00
Patrick Kwong
669a47567b set m_client = NULL before remove_socket which will free itself 2015-06-25 16:03:22 +08:00
Patrick Kwong
a725bb6a73 skip LOG in ping due to deadline_timer cancel 2015-06-24 11:53:06 +08:00
Patrick Kwong
27c432d62a Revert "skip LOG in ping due to deadline_timer cancel"
This reverts commit 83fc4209866a8644a58acb5e7f44cddbeabee048.
2015-06-24 11:51:55 +08:00
Patrick Kwong
83fc420986 skip LOG in ping due to deadline_timer cancel 2015-06-24 11:46:41 +08:00
melo.yao
71f49fabf7 fix format 2015-06-15 23:56:47 +08:00
melo.yao
9abacb177e update readme with build status 2015-06-15 23:53:21 +08:00
melode11
20619ed650 Merge pull request #25 from yandod/travis
add .travis.yml
2015-06-15 22:48:14 +08:00
melo.yao
7a3933e333 breaking change of ack callback, windows compile fix for PR 1.5.0 2015-06-15 22:10:50 +08:00
Yusuke Ando
1b413d3662 add .travis.yml 2015-06-14 01:58:24 +09:00
melode11
9e9d76c089 Merge pull request #24 from stefanhong/master
fix compatibility problem for gcc 4.8+.
2015-06-12 16:39:44 +08:00
melode11
d0e4805fa4 add double accessor for int_message 2015-06-12 10:02:25 +08:00
Stefan Hong
52f92d834e fix compatibility problem for gcc 4.8+. 2015-06-11 14:51:22 +08:00
melode11
8ca73b832f add stronger constraint over reconn_delay calculation 2015-06-03 09:44:53 +08:00
melode11
2e94e799e2 fix wild reconnect after too many times 1.4.1 2015-06-03 09:27:04 +08:00
melode11
bb08c31168 Merge pull request #18 from llamerada-jp/add-libsioclient_tls-to-cmake
Fix installation issue with TLS
2015-05-23 23:09:26 +08:00
Yuji Ito
e4f550173f Add libsioclient_tls to install target. 2015-05-23 18:59:46 +09:00
melo.yao
c617682373 Merge remote-tracking branch 'origin/tls' 1.4.0 2015-05-23 00:45:11 +08:00
melode11
0c1be1bbaa simplify the cmake script and add tls target 2015-05-23 00:22:06 +08:00
melode11
cf5ec9e33b Fix a typo in emit binary example 2015-05-22 12:10:41 +08:00
melode11
e105face52 Update README.md 2015-05-22 10:08:44 +08:00
melode11
98eaa16d79 fix Console demo compile in linux 2015-05-21 21:00:51 +08:00
melode11
4f2e5d7b03 optimize message::list conversion constructor. 2015-05-21 16:43:45 +08:00
melode11
c005a8792d add tls branch 2015-05-19 14:45:56 +08:00
melo.yao
443a59a7f0 fix console demo compile issue in VS2012SP4 1.3.3 2015-05-07 00:19:39 +08:00
melode11
8ea0696217 Merge branch 'master' of https://github.com/socketio/socket.io-client-cpp
Conflicts:
	src/sio_socket.cpp
2015-05-06 23:32:47 +08:00
melode11
df8b2291c8 fix connect timeoute introduced by pull request#11 2015-05-06 23:30:35 +08:00
melode11
28d719a605 Merge pull request #11 from LittleLittle/connect
Avoid duplicated connection event for default namespace.
2015-05-06 22:48:53 +08:00
Jianjun Zhu
c96f72c838 Avoid duplicated connection event for default namespace. 2015-05-06 18:54:14 +08:00
melode11
035ad01cc0 fix link error of sio::event accessors 1.3.2 2015-04-30 00:26:54 +08:00
melode11
933ee08409 unify use of 'std' prefix 1.3.1 2015-04-26 23:27:32 +08:00
melode11
dc46165d09 Merge pull request #8 from LittleLittle/querystring
Allow connect to server with query string.
2015-04-24 23:42:02 +08:00
Jianjun Zhu
b06184bbbf Allow connect with query string. 2015-04-23 17:59:29 +08:00