Commit Graph

  • 6ddfaa86ae Merge commit '33e9a21ce4e38d52f43fe775fb154fc71c09c827' Peter Åstrand (astrand) 2013-11-27 12:26:53 +0100
  • 4dc7c0da7a Merge commit '2d078e8cd83735dad7d98fadcece652d93e2a037' Peter Åstrand (astrand) 2013-11-27 11:36:47 +0100
  • 34a1b68d79 Clarify ssl module build for old python versions. Joel Martin 2013-11-20 07:30:04 -0600
  • a04edfe80f Merge pull request #105 from dosaboy/topic/unit-test-cleanup Joel Martin 2013-11-20 05:21:18 -0800
  • 32c1abd5d9 Added temp dir for unit test data and cleanup Edward Hope-Morley 2013-11-13 12:01:05 +0000
  • a47be21f9f Merge pull request #94 from dosaboy/topic/add-unit-tests Joel Martin 2013-10-29 09:44:48 -0700
  • 5e0ff7d855 Added unit tests for websocket and websocketproxy Edward Hope-Morley 2013-09-20 17:04:52 +0100
  • c3acdc2e38 Merge pull request #93 from dosaboy/topic/set-keepalive-options Joel Martin 2013-10-29 08:18:53 -0700
  • 13c99bcf05 Fix search path construction in tests. Joel Martin 2013-10-29 09:37:02 -0500
  • b4e0b534d5 Merge pull request #104 from stevschmid/patch-1 Samuel 2013-10-24 04:22:44 -0700
  • be4119f84f Fix crash when an import is missing Steven Schmid 2013-10-24 11:42:49 +0200
  • 32b0567343 Merge pull request #103 from dellsystem/master Solly 2013-10-21 18:29:45 -0700
  • 82fe329129 Fix syntax errors in other/websockify.rb dellsystem 2013-10-21 20:59:15 -0400
  • 0e5c3ecfda Merge pull request #102 from DirectXMan12/master Solly 2013-10-21 17:16:09 -0700
  • 53f1f1989e Handle SIGCHLD properly for multiprocessing Solly Ross 2013-10-21 16:50:52 -0400
  • 081046b6cd Adds optional TCP_KEEPALIVE to WebSocketServer Edward Hope-Morley 2013-09-20 16:34:01 +0100
  • a61ae52610 Merge pull request #86 from chrislee35/master Joel Martin 2013-10-15 10:32:57 -0700
  • f074a9f339 Merge eee946d2cf into 477dce6cf8 Chris Lee 2013-10-15 10:31:03 -0700
  • 477dce6cf8 Merge pull request #100 from alonbl/log Joel Martin 2013-10-15 09:41:35 -0700
  • 50e04be7df Merge 8a0a47223d into 4459824cc8 Alon Bar-Lev 2013-10-15 09:18:24 -0700
  • 8a0a47223d websocket: use python logging module Alon Bar-Lev 2013-10-14 20:55:37 +0300
  • 1f798214de websocket: fix exception statement introduced by comment 903e3f06ee557 Alon Bar-Lev 2013-10-15 19:03:33 +0300
  • 4459824cc8 Merge pull request #98 from alonbl/apicleanup Joel Martin 2013-10-14 13:12:40 -0700
  • 8a6aff6443 Merge 028b68b38a into a7fa97f0e1 nttdatainc-openstackers 2013-10-14 12:46:55 -0700
  • 62ef02b835 Merge c2a40d6900 into a7fa97f0e1 Alon Bar-Lev 2013-10-14 12:17:25 -0700
  • c2a40d6900 websocket: do not exit at the middle of process Alon Bar-Lev 2013-05-31 22:21:01 +0300
  • a7fa97f0e1 Merge pull request #99 from alonbl/targetconfig Joel Martin 2013-10-14 11:38:05 -0700
  • 82d253fbc6 Merge 37e40a78f2 into edde5cd0ff Alon Bar-Lev 2013-10-14 11:32:55 -0700
  • 1190fe1204 websocket: restore signals after processing Alon Bar-Lev 2013-10-14 21:13:11 +0300
  • 7026e26d68 websocket: support SIGTERM as exit signal Alon Bar-Lev 2013-05-31 22:07:32 +0300
  • 37e40a78f2 WebSocketProxy: support non path target_cfg Alon Bar-Lev 2013-06-05 15:16:46 +0300
  • edde5cd0ff Merge pull request #91 from MartinF/master Samuel 2013-10-09 06:50:08 -0700
  • 9bd3edd58a Merge e06de83295 into bff3c373b3 Martin From 2013-10-09 03:54:13 -0700
  • bff3c373b3 Merge pull request #96 from DirectXMan12/master Joel Martin 2013-09-27 06:05:55 -0700
  • 8b029b44b8 Merge 354dd6b0a2 into f30ad05c70 Solly 2013-09-27 06:05:08 -0700
  • f30ad05c70 Fix #97: rebind.so not found when installed Joel Martin 2013-09-27 07:42:57 -0500
  • 354dd6b0a2 Enable Process Reaping in All Conditions directxman12 2013-09-20 14:12:35 -0400
  • e06de83295 Fixed wiki reference Martin From 2013-09-09 11:32:57 +0200
  • 028b68b38a Add logger for websockify Rohit Karajgi 2013-07-24 05:43:23 -0700
  • ab389d4e71 Merge pull request #85 from dillaman/master Joel Martin 2013-07-02 10:55:53 -0700
  • eee946d2cf fixed 1.8 compatibility bug for OpenSSL::SSL::SSLSocket#read_nonblock vs #readpartial tested in 1.8 and 2.0 chrislee35 2013-07-02 22:16:01 +0900
  • 73af324a3a adding SSL support and Ruby1.9 support chrislee35 2013-07-02 21:38:22 +0900
  • 0429bfd60e Merge 832118e61a into 264f8fdd7f dillaman 2013-06-28 12:23:52 -0700
  • 832118e61a Collect zombie child processes within server loop Jason Dillaman 2013-06-28 15:22:35 -0400
  • 264f8fdd7f Update to version 0.5.1 v0.5.1 Joel Martin 2013-06-27 16:35:54 -0500
  • 36cb8f4676 Move javascript websockify files to other/js Joel Martin 2013-06-27 16:28:35 -0500
  • 36fcd5784f Add package file for websockify.js Joel Martin 2013-06-27 16:11:11 -0500
  • 46450577c2 Use upstream einaros/ws 0.4.27 with sub-protocol support. Joel Martin 2013-06-27 16:03:16 -0500
  • d3ba23fa64 Update to c0855c6cae of web-socket-js Joel Martin 2013-04-25 09:45:07 -0500
  • 6d27b5d321 Merge pull request #84 from nttdatainc-openstackers/master Joel Martin 2013-06-27 14:01:07 -0700
  • f1447646c3 Merge 888e75a8fb into b7f255ce0b nttdatainc-openstackers 2013-06-24 06:25:31 -0700
  • 888e75a8fb Add 2 arguments to websockify.WSRequestHandler NTT Data OpenStackers 2013-06-24 06:09:01 -0700
  • b7f255ce0b Clarify messages when optional modules are not found. Joel Martin 2013-04-19 17:14:20 -0500
  • 477947ba96 Remove wsproxy references. Sync launch.sh from noVNC. Joel Martin 2013-04-15 12:22:08 -0500
  • 33e9a21ce4 Add gimite/web-socket-js submodule for DFSG compliance. Joel Martin 2013-04-12 08:20:25 -0500
  • 2d078e8cd8 Merge pull request #76 from SlapOS/include Joel Martin 2013-04-03 09:44:37 -0700
  • 02d426ffe9 Merge d6d960dbe5 into 903198a724 Cédric de Saint Martin 2013-04-03 03:20:10 -0700
  • d6d960dbe5 correctly include include directory in egg. Cédric de Saint Martin 2013-04-03 12:12:37 +0200
  • efd5e5d3c2 Merge 4f356d99bb into 903198a724 Rafi Khardalian 2013-03-22 17:18:58 -0700
  • 4f356d99bb Eliminate attribute errors on last code/msg Rafi Khardalian 2013-03-22 17:18:47 -0700
  • ed109d7ec8 Fix Python3 compatibility when using --libserver. Peter Åstrand (astrand) 2013-03-20 15:09:58 +0100
  • bc917863e0 Improved class documentation. Peter Åstrand (astrand) 2013-03-20 13:30:16 +0100
  • e964c1edff Let our ProxyRequestHandler be default. This allows you to inherit from WebSocketProxy without having to specify handler class. Peter Åstrand (astrand) 2013-03-20 11:34:46 +0100
  • f5e42ff6f4 Move WebSocketProxy class so that it is defined after the requesthandler. Removed comments about above/below which does not make sense any longer. No functional changes. Peter Åstrand (astrand) 2013-03-20 11:30:38 +0100
  • f594d70daf Removed unused import of SimpleHTTPRequestHandler. Peter Åstrand (astrand) 2013-03-20 11:00:34 +0100
  • d0608a63b6 Make echo.py and load.py work again, after the refactoring of websocket.py: Peter Åstrand (astrand) 2013-03-20 10:03:04 +0100
  • 09f3ec7125 Rename self.client to self.request, ie adapt to: Peter Åstrand (astrand) 2013-03-20 09:03:18 +0100
  • 95593ac4bf Merge branch 'master' of github.com:astrand/websockify Peter Åstrand (astrand) 2013-03-18 14:59:03 +0100
  • 1eecc7b17a Merge remote branch 'upstream/master' Peter Åstrand (astrand) 2013-03-18 14:50:46 +0100
  • b05b773bd7 Corrected last commit. Peter Åstrand (astrand) 2013-03-18 13:25:53 +0100
  • debc926612 Renamed CustomProxyServer to WebSocketProxy; this was the earlier name. Peter Åstrand (astrand) 2013-03-18 13:22:48 +0100
  • 70eb75a3e6 Fix error with modern Python 2.X versions: Peter Åstrand (astrand) 2013-03-18 12:04:50 +0100
  • 903198a724 tests: use new module path and remove Hixie code. Joel Martin 2013-03-14 12:24:58 -0500
  • 7b3dd8a6f5 Try to solve https://github.com/kanaka/websockify/issues/71 by refactoring. Basically, we are dividing WebSocketServer into two classes: One request handler following the SocketServer Requesthandler API, and one optional server engine. The standard Python SocketServer engine can also be used. Peter Åstrand (astrand) 2013-03-14 16:07:40 +0100
  • 208f83b9a2 Prepare for fixing https://github.com/kanaka/websockify/issues/71: Peter Åstrand (astrand) 2013-03-14 16:00:11 +0100
  • 4e3388964a Prepare for fixing https://github.com/kanaka/websockify/issues/71: Move around functions and methods, so that connection-related and server-related stuff are close together. Peter Åstrand (astrand) 2013-03-14 15:50:49 +0100
  • b9e1295f7a Prepare for solving https://github.com/kanaka/websockify/issues/71: Peter Åstrand (astrand) 2013-03-14 15:23:44 +0100
  • d3865688c8 README: no longer supporting Hixie. Joel Martin 2013-03-12 13:54:11 -0500
  • 5a726c2e4d Merge pull request #70 from astrand/master Joel Martin 2013-03-12 11:52:30 -0700
  • d813156dd1 Merge b2fe57c950 into db6a7e3e28 astrand 2013-03-12 11:51:43 -0700
  • db6a7e3e28 Update to version 0.4.1 v0.4.1 Joel Martin 2013-03-12 13:46:45 -0500
  • d9aedfe7d3 Update to version 0.4.0 v0.4.0 Joel Martin 2013-03-12 13:10:53 -0500
  • b2fe57c950 Remove support for old Hixie protocols. Hybi protocols 7 and 8 are still supported, in addition to protocol 13 - RFC 6455. Peter Åstrand (astrand) 2013-03-04 09:38:29 +0100
  • 805026360e Use Buffer base64 support instead of pkrumins/node-base64 Joel Martin 2013-02-19 13:12:10 -0600
  • 3d37d21b5f Update to version 0.3.0 and upload to pypi. v0.3.0 Joel Martin 2013-01-15 11:49:08 -0600
  • 2dc9118cc5 Added to --auth-token option instead of using env vars, seems cleaner. Matthew Balman 2012-11-30 21:34:04 +0000
  • 734cc19c86 added more hooks, passed more env_vars, more security, more awesome Matthew Balman 2012-11-30 19:34:47 +0000
  • c33f0b52e7 In Opera 12.10, set binaryType earlier. Joel Martin 2012-11-14 12:24:08 -0500
  • 1d795c0643 Pull include/util.js from noVNC. Joel Martin 2012-11-01 11:07:26 -0500
  • c00c0eed1a websocket.py: close lsock on stop. Joel Martin 2012-10-31 12:04:16 -0500
  • 47fb367486 websocketproxy.py: fix for python2.4 Joel Martin 2012-10-30 08:34:47 -0500
  • 5e16b38524 websocketproxy.py: put client socket handling first. Joel Martin 2012-10-29 18:12:54 -0500
  • c728f43c63 README.md: clarify binary vs base64 negotiation. Joel Martin 2012-10-29 17:17:56 -0500
  • d1458d0063 websocketproxy.py: better missing token exception. Joel Martin 2012-10-29 17:05:23 -0500
  • 66d772a6bc Ignore other/node_modules directory (node.js modules). Joel Martin 2012-10-29 17:04:39 -0500
  • a670af376e websockify.js: add encrypted HTTPS/WSS support. Joel Martin 2012-10-29 16:59:46 -0500
  • 16691395e0 websock.js: use iteration to receive binary data Joel Martin 2012-10-26 18:01:35 -0500
  • 3018cf8c1a websockify.js: executable, fix usage statement. Joel Martin 2012-10-26 18:01:05 -0500
  • 6a126405bd websockify.js: binary data, better logs and err handling. Joel Martin 2012-10-26 15:47:36 -0500
  • ee2f269c06 websocket.py: fix recording and refactor unmask. Joel Martin 2012-10-17 11:54:59 -0500