Commit Graph

3318 Commits

Author SHA1 Message Date
Nick Bolton d6cefa73a0 Removed test prepend string from previous commit 2015-05-26 16:49:59 +01:00
Nick Bolton 5faa5178b4 Remove 'heads/' string from git branch name 2015-05-26 16:49:23 +01:00
Nick Bolton 9b3d6d5665 Fake commit to force buildbot to build this branch 2015-05-26 16:31:56 +01:00
Nick Bolton 55c9f46156 Fixed version name for 1.7.1 in ChangeLog 2015-05-26 16:01:45 +01:00
Nick Bolton ace8ffd6a8 Fixed version names in ChangeLog 2015-05-26 15:58:49 +01:00
Nick Bolton f5d303cab2 ChangeLog for v1.7.3-stable 2015-05-26 15:58:49 +01:00
Nick Bolton 8b975878c2 Limited clipboard size to 1kb when SSL is enabled
@XinyuHou I had no choice but to block clipboard data over 1kb in
size... anything over that and you get an access violation.
2015-05-26 15:04:04 +01:00
Nick Bolton fd72bf17ce Reworded SSL errors to be more consistent 2015-05-26 14:17:30 +01:00
Nick Bolton 42ed1c2f27 Increased ssl error rate limit from 50k to 100k
@speaker This is nuts... my mac client now errors 50k times before it
eventually connects.
2015-05-26 14:14:24 +01:00
Nick Bolton 3dc3d5b309 Increased ssl error rate limit from 60 to 50000
@speaker, a 50k limit seems a bit insane, but it seems to be the only
way to get my Mac client to establish a connection :-/
2015-05-26 14:00:50 +01:00
Nick Bolton e96cead732 Fixed wrong sprintf specifier used (%s instead of %d)
My bad, I was being carless in 4aa57cfbdb
2015-05-26 12:19:13 +01:00
Nick Bolton 4aa57cfbdb Fixed code style, more consistent logging 2015-05-25 20:24:29 +01:00
Nick Bolton 1cea4bb80f Fixed code style, use lower case for logging 2015-05-25 20:20:12 +01:00
Nick Bolton 0fdcfe9b95 Fixed code style, prefer enums over macros 2015-05-25 20:20:12 +01:00
Nick Bolton 3563217c7b Fixed Mac package platform variable name 2015-05-25 19:54:34 +01:00
Nick Bolton 590d0482b3 Removed useless processor type return for Mac 2015-05-25 19:54:21 +01:00
Nick Bolton e8a43dd020 Simplified logic to detect Linux 64/32 deb/rpm 2015-05-25 19:41:53 +01:00
Nick Bolton e479f16705 Incremented default plugin version to 1.1 2015-05-25 18:59:58 +01:00
Nick Bolton cae767735c Download specific plugin version on Mac 2015-05-25 18:59:58 +01:00
Nick Bolton 38bcea54d8 Do nothing if plugins dir doesn't exist 2015-05-25 18:17:09 +01:00
Nick Bolton 14bb44f539 Comment explaining lack of 10.7 support 2015-05-25 17:41:38 +01:00
Nick Bolton 25237a14b7 Revert "Allowed Mac OS X 10.7 to build ns plugin "
This reverts commit a900543c1d.
2015-05-25 17:40:36 +01:00
Nick Bolton 8ed3d79cc2 Only upload plugin if file exists
Some platforms (e.g. Mac 10.6) don't build the plugin
2015-05-25 16:57:28 +01:00
Nick Bolton a900543c1d Allowed Mac OS X 10.7 to build ns plugin 2015-05-25 16:53:46 +01:00
Nick Bolton b4b5ce6483 Missing change from last commit, print error 2015-05-25 16:23:21 +01:00
Nick Bolton d278c2d8d4 Swallow mkd fail in case nlst doesn't work 2015-05-25 16:22:45 +01:00
Nick Bolton 91d05c29db Upload 'ns' to plugins dir (create if not exists) 2015-05-25 16:05:16 +01:00
Nick Bolton e4959a7661 Removed angry files accidentally uploaded
I'm having a bad day
2015-05-25 15:44:18 +01:00
Nick Bolton cbb4cec841 Fixed bad indentation for getLinuxPlatform()
Caused by 16d9bd8f0d
2015-05-25 15:28:32 +01:00
Nick Bolton b71c298163 Changed sleep time to 100ms for unit test (hack) 2015-05-25 15:25:14 +01:00
Nick Bolton 16d9bd8f0d Fixed messed up indentation in commands1.py 2015-05-25 15:19:54 +01:00
Nick Bolton 74dda188dc Reintroduced accidentally removed functions 2015-05-25 15:17:18 +01:00
Nick Bolton 6ba2ddeb7d Added ns upload support to distftp step
Needed to refactor the 'figure out platform and ext' code.
2015-05-25 15:07:32 +01:00
Nick Bolton d175ad5c70 Moved installer output to Release build config dir
Missing change from last commit
2015-05-25 14:55:03 +01:00
Nick Bolton 6788f3db39 Moved installer output to Release build config dir 2015-05-25 14:21:09 +01:00
Nick Bolton 18344e6b52 Copy ns plugin to debug dir when in debug mode 2015-05-25 13:08:47 +01:00
Nick Bolton f322a79760 Copy plugins to config dir on Mac 2015-05-25 13:07:36 +01:00
Jerry (Xinyu Hou) b1f2abbaae Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-05-22 16:39:33 -07:00
Xinyu Hou fb3252efef Added a way to interrupt sending clipboard/file 2015-05-23 00:34:00 +01:00
Adam Potolsky 905dbfee90 Fixed order of initializers for mac build 2015-05-22 16:26:40 -07:00
Adam Potolsky 773530506e Merge branch 'master' of https://github.com/synergy/synergy 2015-05-22 16:10:29 -07:00
Adam Potolsky 35e09c46b9 Changed secureSocket routines to return a status, and modify an argument for num of bytes handled 2015-05-22 16:09:59 -07:00
Jerry (Xinyu Hou) ff9ad5554a Used different chunk size for SSL and non-SSL socket 2015-05-22 13:30:50 -07:00
Jerry (Xinyu Hou) 36ddc4f1c1 Fixed indentation 2015-05-22 13:10:22 -07:00
Jerry (Xinyu Hou) 625feab104 Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-05-22 12:40:24 -07:00
Jerry (Xinyu Hou) c1d859e35a Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-05-22 11:28:39 -07:00
Jerry (Xinyu Hou) a81b88c730 Refactored file assemble and send code 2015-05-22 11:27:57 -07:00
Adam Potolsky 7b718dc586 Forgot to change linux specific variable name 2015-05-22 11:17:10 -07:00
Adam Potolsky 86ad2bf080 Merge branch 'master' of https://github.com/synergy/synergy 2015-05-22 10:56:33 -07:00
Adam Potolsky 5b3fa48902 Made socket self-aware of when it is in a fatal state
Added code to cleanly terminate connection on fatal socket state 
2015-05-22 10:56:13 -07:00