Commit Graph

  • afb5d2801f Enable Travis Solly Ross 2015-05-06 14:29:51 -0400
  • 52f6830852 Update Tests and Test Plugins Solly Ross 2015-05-06 13:49:13 -0400
  • f6e9fbe5cf Process plugin parameters in main Solly Ross 2015-04-28 17:08:36 -0400
  • aaefff0bf0 Fix bug in ReadOnlyTokenFile Solly Ross 2015-04-28 17:01:01 -0400
  • c6557d3d81 Introduce Auth Plugins Solly Ross 2015-04-28 16:17:47 -0400
  • cd4bc7590e Update to 0.6.1 v0.6.1 patches Solly Ross 2015-05-11 10:35:55 -0400
  • d626fed76a Restore functionaltiy to file_only Solly Ross 2015-05-11 10:24:38 -0400
  • 7e623fe05e Restore functionaltiy to file_only. Solly Ross 2015-05-11 10:24:38 -0400
  • 452d9582cc Merge pull request #169 from AricStewart/ping-pong Solly 2015-04-21 14:05:07 -0400
  • 52adf957b3 Add ping heartbeat option Aric Stewart 2015-04-10 13:14:31 -0500
  • 731fd20796 Add option to turn on auto-pong Aric Stewart 2015-04-10 11:23:52 -0500
  • 52c2e62535 Fix bug in token_plugin/target_cfg support Solly Ross 2015-04-09 11:36:37 -0400
  • ac9d357c87 Merge pull request #161 from rafaelfolco/bug/150-websocket-bigendian Solly 2015-04-07 12:51:52 -0400
  • ce07749223 Merge pull request #162 from kanaka/feature/token-plugins Solly 2015-04-07 12:51:02 -0400
  • af10f458a1 BUGFIX: Websocket frame corruption on big-endian #150 Rafael Folco 2015-03-25 01:20:25 -0300
  • 00a4bea024 Catch interrupted system call Bennett Kanuka 2015-04-04 20:11:13 -0400
  • ea76bc9d8b don't make numpy a hard requirement Sean Dague 2015-03-27 09:45:35 -0400
  • 69a8b928aa Introduce Token Plugins Solly Ross 2015-03-26 16:01:57 -0400
  • e67a8c4908 added mechanism to ensure data send in case that websocket.bufferedAmount > api.maxBufferedAmount Daniel 2015-03-24 12:17:22 +0200
  • 3baf471b15 Merge b42b3dbce5 into 19b558e4cd Lukáš Zapletal 2015-03-23 21:32:28 +0000
  • 73014230b0 Merge ed889b238e into 19b558e4cd James Portman 2015-03-19 02:27:36 +0000
  • 19b558e4cd Merge pull request #159 from vaibhavsagar/python3-trove Solly 2015-03-17 10:32:40 -0400
  • dcdf0a0b6c Add Python 3 trove classifiers. Vaibhav Sagar 2014-12-06 23:01:19 +0700
  • ef4a429646 Merge 49b4359f4b into 23045cb212 Vaibhav Sagar 2015-03-14 05:27:11 +0000
  • 49b4359f4b Add Python 3 trove classifiers. Vaibhav Sagar 2014-12-06 23:01:19 +0700
  • fad9d96235 Don't use implicit relative imports Solly Ross 2015-02-03 16:51:01 -0500
  • 7caa89f5a8 Fixed Package.json ags131 2014-05-16 11:56:24 -0500
  • 4060d24de5 python3 compatibility fixes Radek Podgorny 2014-10-02 11:42:17 +0200
  • 99c3e10d6e sync with commit from PR #347 in noVNC samhed 2014-08-19 14:13:00 +0200
  • 7355ca32c9 Merge 79a8d20ff9 into 23045cb212 dhilipsiva 2015-03-11 11:58:51 +0000
  • ed889b238e adding get target via api allows to get targets from local rest/json API rather than hardcoded files james-portman 2015-02-13 22:47:17 +0000
  • 79a8d20ff9 Adding `get_target_via_api` [Squashed commit] dhilipsiva 2015-03-11 17:18:47 +0530
  • 1e260b3813 now with daemonize and additional options Jesse Sanford 2015-02-14 14:24:20 -0800
  • 23045cb212 Merge pull request #155 from kanaka/bug/154-no-implicit-relative-imports Solly 2015-02-06 11:29:57 -0500
  • acd276e1a2 Don't use implicit relative imports Solly Ross 2015-02-03 16:51:01 -0500
  • 999a133bc5 Merge pull request #128 from ags131/patch-1 Solly 2015-01-05 12:15:56 -0500
  • a818dd312f added option parsing back in Jesse Sanford 2014-12-14 13:37:18 -0500
  • 8675580f1c added ability to set target host and port using path Jesse Sanford 2014-11-03 16:55:14 -0500
  • f36877c684 Merge pull request #140 from rpodgorny/python3 Joel Martin 2014-10-02 10:02:11 -0500
  • 303a71310c python3 compatibility fixes Radek Podgorny 2014-10-02 11:42:17 +0200
  • f345e4e86a Add "text" subprotocol, and make it the default. kousu 2014-09-14 22:11:26 -0400
  • 63209f84ca sync with commit from PR #347 in noVNC samhed 2014-08-19 14:13:00 +0200
  • 4d801a010a Remove explicit numpy requirement from install_requires Burt Holzman 2014-08-08 10:42:43 -0500
  • d37e729587 Merge pull request #129 from mmb/master Joel Martin 2014-05-20 18:01:00 -0500
  • 12191d266b Fix typo in reaping zombies message. Matthew M. Boedicker 2014-05-20 14:43:35 -0700
  • 67a12a2394 Fixed Package.json ags131 2014-05-16 11:56:24 -0500
  • 7e59539b6f Merge cb3eb8ec56 into 6c526fd645 ags131 2014-05-16 16:45:33 +0000
  • cb3eb8ec56 Update package.json ags131 2014-05-16 11:45:24 -0500
  • b42b3dbce5 Show main exception only with --verbose Lukas Zapletal 2014-04-28 09:48:17 +0200
  • 6c526fd645 remove some trailing whitespaces samhed 2014-04-14 14:20:00 +0200
  • 712e17aaef kill 9 warnings when compile on OS X 10.9 liyiwei 2014-04-07 14:40:27 +0800
  • e36a59d6a1 add run-once option help message liyiwei 2014-04-07 12:46:50 +0800
  • 6c1a2e9032 Avoid using the %-operator, URL-escaped strings can contain extra %'s which can cause bugs. samhed 2014-03-18 15:21:13 +0100
  • 739af6ecb4 Update to v0.6.0 v0.6.0 Solly Ross 2014-02-18 17:02:26 -0500
  • 56b740ef5c README: update with general contact info. Joel Martin 2014-02-03 09:26:03 -0600
  • 3ee9ff7f4d Work around lack of SIGCHLD on Windows bug/108-no-sigchld-in-windows Solly Ross 2014-01-30 17:24:42 -0500
  • 18e70c52e1 Fix default log level in echo and load tests Solly Ross 2014-01-30 17:08:50 -0500
  • cc3ccf0ddd README: fix wrap mode examples. Joel Martin 2014-01-13 13:25:13 -0600
  • f81de71522 fix cygwin compilation chummm 2013-12-27 01:58:32 +0000
  • ab84fe3fb2 Merge b79d0a7ca6 into 38db12c2b0 Robert Jensen 2013-12-26 16:23:25 -0800
  • b79d0a7ca6 merge conflict chummm 2013-12-27 00:22:53 +0000
  • 888fc4e17c define exc for unhandled exception chummm 2013-12-27 00:17:39 +0000
  • 333249c033 define exc for unhandled exception chummm 2013-12-27 00:17:39 +0000
  • 76f113b751 fix cygwin compilation chummm 2013-12-26 23:31:03 +0000
  • 38db12c2b0 Merge pull request #111 from astrand/master astrand 2013-12-19 01:31:14 -0800
  • a749611370 Merge remote branch 'upstream/master' Peter Åstrand (astrand) 2013-12-19 10:28:37 +0100
  • b662d185ca Prepare for fixing https://github.com/kanaka/websockify/pull/111 Peter Åstrand (astrand) 2013-12-19 10:24:36 +0100
  • 6de6933819 Minor whitespace and layout tweaks, to reduce diff against upstream/master. Peter Åstrand (astrand) 2013-12-17 14:20:14 +0100
  • f46db48399 Merge remote branch 'upstream/master' Peter Åstrand (astrand) 2013-12-17 14:04:30 +0100
  • 8049ddfe26 Cherry-picked 4e3388964a from astrand/websockify: Peter Åstrand (astrand) 2013-12-17 13:56:20 +0100
  • f64e3dea51 Merge remote branch 'upstream/master', after #110 was merged. Peter Åstrand (astrand) 2013-12-16 16:18:41 +0100
  • 17455afe4d Merge pull request #110 from astrand/rename-self-client astrand 2013-12-16 05:45:03 -0800
  • 047ce47742 Rename new_client to new_websocket_client, in order to have a better name in the SocketServer/HTTPServer request handler hierarchy. Prepare for merge pull request #72. This work has been picked out of 7b3dd8a6f5 . Peter Åstrand (astrand) 2013-11-28 13:33:28 +0100
  • 558402848e Rename self.client to self.request, in preparation for merging pull request #72. The standard Python SocketServer/BaseRequestHandler requires this name. Peter Åstrand (astrand) 2013-11-28 13:23:50 +0100
  • 41af3c3203 Merge db93395061 into 34a1b68d79 astrand 2013-11-28 04:04:54 -0800
  • db93395061 Follow up on 131f9ea645ac6f00d98743a420d168033f99063a: Proper logging in request handler class. Peter Åstrand (astrand) 2013-11-28 12:37:57 +0100
  • e246e98b20 Merge commit '34a1b68d79a13c03aa63b5c4194796341c9383fe' Peter Åstrand (astrand) 2013-11-28 09:34:43 +0100
  • 7ecfa4f384 Merge commit 'a04edfe80f54b44df5a3579f71710560c6b7b4fc' Peter Åstrand (astrand) 2013-11-28 09:34:33 +0100
  • bc216fb7d1 Merge commit 'a47be21f9fa69ddf8d888ff9e3c75cdfc9e31c00' Peter Åstrand (astrand) 2013-11-28 09:32:49 +0100
  • b92528aeba Merge commit 'c3acdc2e38f871e28ffda1847b4338c4b02296b8' Peter Åstrand (astrand) 2013-11-28 09:32:30 +0100
  • 81e2a53692 Merge commit '13c99bcf053f7f3af8ba84c0d963a9591e020f49' Peter Åstrand (astrand) 2013-11-28 09:14:25 +0100
  • 602248425a Merge commit 'b4e0b534d5d04d57265045b4baf49dd81555064b' Peter Åstrand (astrand) 2013-11-28 09:09:03 +0100
  • 3b802c08b7 Merge commit '32b0567343aee7753b2b6be1bc1ee9a69657ba26' Peter Åstrand (astrand) 2013-11-28 09:07:52 +0100
  • 972b30ddc2 Merge commit '0e5c3ecfda3b1506b41412052db75d84df2b4ae7' Peter Åstrand (astrand) 2013-11-28 09:07:41 +0100
  • f58b49fa08 Merge commit 'a61ae52610642ae58e914dda705df8bb9c8213ec' Peter Åstrand (astrand) 2013-11-28 09:07:30 +0100
  • 131f9ea645 Merge commit '477dce6cf86d61b20a394f3cbf3170e60d199658' Peter Åstrand (astrand) 2013-11-28 09:05:24 +0100
  • cbf05f84fe Merge commit '4459824cc8196ad78fe9258b6c560ad46fe4cd52' Peter Åstrand (astrand) 2013-11-27 14:49:54 +0100
  • 611da86353 Merge commit 'a7fa97f0e14926cc4433483fcb7581e0b3782140' Peter Åstrand (astrand) 2013-11-27 13:41:00 +0100
  • fb4ac5ae51 Merge commit 'edde5cd0ff6059bddae10c9b9faf0b3e8f388a9e' Peter Åstrand (astrand) 2013-11-27 13:38:03 +0100
  • 063c7de783 Merge commit 'bff3c373b32ebf707085e3c677bfad19b44fa054' Peter Åstrand (astrand) 2013-11-27 13:34:17 +0100
  • 08d37e0deb Merge commit 'f30ad05c70ab2a43c9078e2f79da40f1dc0c60ec' Peter Åstrand (astrand) 2013-11-27 13:33:30 +0100
  • ff30e5461f Merge commit 'ab389d4e7114d7ddbfd085591d336ea5cc06c00d' Peter Åstrand (astrand) 2013-11-27 13:30:30 +0100
  • 4071291fa9 Merge commit '264f8fdd7f12bd5b9f6813fb8de81c55b6328d9b' Peter Åstrand (astrand) 2013-11-27 13:30:22 +0100
  • 611effd83b Merge commit '36cb8f4676c7b5ff34bd22ad729e00e77efb6f00' Peter Åstrand (astrand) 2013-11-27 13:30:13 +0100
  • b63d197292 Merge commit '36fcd5784fa0825eedbf31d91bc42c970605ddb4' Peter Åstrand (astrand) 2013-11-27 13:30:05 +0100
  • cf901ddac5 Merge commit '46450577c2fb119fc5bf0ac09664f22651a080d0' Peter Åstrand (astrand) 2013-11-27 13:29:54 +0100
  • 122985bd67 Merge commit 'd3ba23fa64d79eeb602ff1015ec31014fd8e9b35' Peter Åstrand (astrand) 2013-11-27 13:29:45 +0100
  • 19c8482236 Merge commit '6d27b5d321978586ea1601f757ead73dfba03da7' Peter Åstrand (astrand) 2013-11-27 13:27:38 +0100
  • 33a1bd2337 Merge commit 'b7f255ce0b21dc42189205b1f0e46b4f1d9854f9' Peter Åstrand (astrand) 2013-11-27 12:27:43 +0100
  • 5f8cb96bab Merge commit '477947ba96a00032ae35ac55fd02a4a5f485497e' Peter Åstrand (astrand) 2013-11-27 12:27:31 +0100