Commit Graph

84 Commits

Author SHA1 Message Date
Erik 404fa8cdfa
Merge branch 'development' into swift2.3
* development:
  change spm name
  Modify mac version base mac os 10.9
  Fix cocoapods name
  fix sid bug
  Fix socketio/socket.io-client-swift#472
  bump version
  Refactor engine. Fix infinite recursion in configuration
  Don't send whole packet to handleConnect
  Update readme
  bump version
  update readme
  Renamed modules to make then consistent.
  rename engine init
  Revert "travis plz"
  travis plz
2016-09-02 17:40:58 -04:00
Erik cf12865aa0
fix sid bug 2016-08-29 05:10:03 -04:00
Erik bd7f94333d
Refactor engine. Fix infinite recursion in configuration 2016-08-27 13:05:22 -04:00
Erik 07f2ca5f16
rename engine init 2016-08-14 11:06:55 -04:00
Erik e3c6993f75
merge development 2016-08-14 10:39:13 -04:00
Erik e2bf84f576
Add SocketIOClientConfiguration 2016-08-13 14:55:33 -04:00
Erik a0c6b8b622
Merge develop 2016-08-11 21:38:57 -04:00
Erik b6cb0b2c7b
bump websocket version 2016-08-08 18:24:42 -04:00
Erik ee63c4e386
refactor out checking for base64 2016-08-02 20:14:04 -04:00
Erik ea1fc1b0cc
Merge branch 'development' into swift2.3
* development:
  bump version
  add check for bad paths
  Fix socketpollable crashing
  make nonobjc
  More privatisation
  Making publicKeyChainForTrust() private.
  api extensions doesn't seem to fail for me
  update readme
  don't use api extensions only
2016-07-29 19:43:18 -04:00
Erik d03d77aff8
add check for bad paths 2016-07-28 21:36:37 -04:00
Erik dbbed11a03
fix warning 2016-07-28 21:19:40 -04:00
Erik 637e0bb14c
Fix socketpollable crashing 2016-07-27 21:16:48 -04:00
Erik 744d6bd062
Merge branch 'development' into swift2.3
* development:
  bump version
  fix swiftpm
  rename variable
  Enable APPLICATION_EXTENSION_API_ONLY
  fix method call
  fixes
  don't stall queues
  hopefully fix race condition in acks
  refactors
  Update README.md
  refactors, rename file
  refactoring
  refactor some serialization into methods
2016-07-20 11:32:38 -04:00
Erik 17d3e659c1 refactor some serialization into methods 2016-07-01 15:36:06 -04:00
Erik 5814e8d275 Merge branch 'master' into swift2.3
* master:
  unknown message isn't fatal
  bump version
  notify client when engine disconnects
2016-06-24 02:49:14 -04:00
Erik 2e5442d386 unknown message isn't fatal 2016-06-24 02:35:18 -04:00
Erik 4383ddfe65 notify client when engine disconnects 2016-06-24 02:21:25 -04:00
Erik be76a1607c merge master 2016-06-17 10:16:52 -04:00
Erik 6fd3294fba Revert "swift 2.3"
This reverts commit bfa163f3c2.
2016-06-14 19:41:18 -04:00
Erik bfa163f3c2 swift 2.3 2016-06-14 19:37:27 -04:00
Erik e163598ee6 add option for sslsecurity 2016-06-14 16:11:37 -04:00
David Beck 0e38039a0c Updated code to support Swift 2.3 2016-06-14 07:31:15 -07:00
Erik 2c059e1a6e log server 2016-06-14 09:38:35 -04:00
Erik cb0a6f5460 rename method 2016-06-07 13:20:23 -04:00
Erik b919d3e411 hopefully fix socket.io/socket.io-client-swift#374 2016-06-07 13:12:34 -04:00
Erik 02f30a81dd fix test 2016-06-06 16:25:37 -04:00
Erik e57bcba47d encoding should already be done at this point 2016-06-06 15:41:19 -04:00
Erik 71f9058723 refactors: refactor creating packet string, various other refactors 2016-05-30 21:42:00 -04:00
Erik Little 4fa3225cba Merge pull request #372 from ATLCTO/master
Fix crash if error contains formatting strings.
2016-05-25 08:19:28 -04:00
Patrick Childers 3d47ff469f Fix crash if error contains formatting strings. 2016-05-23 17:03:51 -04:00
Erik 3401414430 bump websocket 2016-05-17 22:35:33 -04:00
Erik 50216647ca refactors 2016-05-11 13:40:45 -04:00
Yannick Loriot 119b479be2 Minor refactoring to make the build of the query more readable 2016-05-04 13:03:40 +02:00
Yannick Loriot 9ff90f511e Fixing url encoding for connect params 2016-05-04 12:56:14 +02:00
Erik 8e1434e63b change status names, execute engine connect on emitQueue 2016-04-27 14:38:11 -04:00
Erik 44ee94d2ac refactors 2016-04-26 15:28:08 -04:00
Erik d4c01183ab style 2016-03-25 09:48:04 -04:00
Erik a0167ae213 remove deprecated methods 2016-03-23 13:39:22 -04:00
Erik 718caba9d9 remove nstimer 2016-03-22 09:56:56 -04:00
Erik 6c6b4f32c9 Update for swift 2.2 2016-03-22 09:00:27 -04:00
Erik 3a842469ec fix log placement 2016-03-16 13:13:22 -04:00
Erik 596a499041 work on fixing reconnect() 2016-03-11 13:41:09 -05:00
Erik 2f4c942dcf use connect/disconnect for engine 2016-02-23 10:33:14 -05:00
Erik 70283acc1f add messages to deprecated methods 2016-02-17 14:27:48 -05:00
Erik fe9ee602e7 add option for toggling double encoding utf8 2016-02-15 10:43:21 -05:00
Erik 0f70079382 fix possible race condition 2016-02-11 09:36:36 -05:00
Erik 76ef3596f0 possible fix for socketio/socket.io-client-swift#279 2016-02-01 21:56:49 -05:00
Erik d71f81745e move websocketurl plus sid to computed property 2016-01-26 14:17:11 -05:00
Erik c5c00510e5 remove unused property 2016-01-26 11:03:32 -05:00