Commit Graph

  • bff3c373b3 Merge pull request #96 from DirectXMan12/master Joel Martin 2013-09-27 06:05:55 -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
  • 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
  • 832118e61a Collect zombie child processes within server loop Jason Dillaman 2013-06-28 15:22:35 -0400
  • 264f8fdd7f Update to version 0.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
  • 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
  • d6d960dbe5 correctly include include directory in egg. Cédric de Saint Martin 2013-04-03 12:12:37 +0200
  • 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
  • db6a7e3e28 Update to version 0.4.1 Joel Martin 2013-03-12 13:46:45 -0500
  • d9aedfe7d3 Update to version 0.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. Joel Martin 2013-01-15 11:49:08 -0600
  • 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
  • 780cb8a9e6 util.js, websock.js: sync with noVNC - dynamic script loading. Joel Martin 2012-10-17 11:52:28 -0500
  • 388d9573fd Merge pull request #65 from lovelysystems/master Joel Martin 2012-10-15 14:04:27 -0700
  • 578dba1987 include/*util.js: update to versions from noVNC. Joel Martin 2012-10-11 12:30:11 -0500
  • 124c9a7d88 Change include/websock.js (and deps) to MPL 2.0 license. Joel Martin 2012-10-11 12:20:47 -0500
  • e53fa10397 updated version Jodok Batlogg 2012-10-15 22:06:50 +0200
  • 1295668abb Merge pull request #64 from vishvananda/fix-import Joel Martin 2012-09-26 07:35:05 -0700
  • 880257a431 Import everything in websocketproxy and websocket Vishvananda Ishaya 2012-09-25 22:23:01 -0700
  • 8b3125bcf3 other/websockify.js: arg cleanup, remove deprecated call. Joel Martin 2012-09-21 08:19:40 -0500
  • 471b504799 Merge branch 'master' of github.com:kanaka/websockify Joel Martin 2012-09-21 07:32:54 -0500
  • b713acbeff Merge pull request #59 from dosht/master Joel Martin 2012-09-21 05:31:47 -0700
  • ff736e9ad3 Fix issue #60: not all arguments converted Joel Martin 2012-09-21 07:28:08 -0500
  • 384c2772fb Merge pull request #61 from vishvananda/fix-popen Joel Martin 2012-09-21 05:24:50 -0700
  • e6d8d8f242 Gracefully handle errors when popping kwargs. Joel Martin 2012-09-21 07:08:04 -0500
  • ca8efbf657 Reset SIGPIPE handler when calling Popen Vishvananda Ishaya 2012-09-20 07:46:04 -0700
  • eb6d4e183b Fix --unix-target option mostafa sameh 2012-09-18 09:20:39 +0200
  • 6d9deda9c5 Pull upstream web-socket-js with IETF 6455 support. Joel Martin 2012-09-17 16:50:46 -0500
  • 96890fab97 include/websock.js: cleanup and fix protocol list check. Joel Martin 2012-09-17 16:49:36 -0500
  • c0d23e27e4 Refactor into python modules: websocket, websocketproxy Joel Martin 2012-09-17 14:06:51 -0500
  • 2d2798954e websockify version 0.2.0 Joel Martin 2012-09-17 12:52:54 -0500
  • 44e5fa0b82 Merge pull request #56 from AricStewart/master Joel Martin 2012-09-06 20:02:04 -0700
  • 82cb31f3b6 change --idle-timeout to reset the idle timeout when active Aric Stewart 2012-08-31 10:55:24 -0500
  • 9348dd5208 Implement option --idle-timeout Aric Stewart 2012-08-31 09:24:09 -0500
  • 17175afd73 websock.js: make protocols parameter of open(). Joel Martin 2012-08-16 13:28:28 -0500
  • 53b074e8e7 websock.js: simplify rQshiftStr with apply(). Joel Martin 2012-08-16 13:27:50 -0500
  • 068065e465 Simpler (but working) binary support. Joel Martin 2012-08-16 12:21:21 -0500
  • 376872d993 Use WebSocket binary data (no base64 enc/dec) if available. Joel Martin 2012-08-14 15:19:38 -0500
  • f55362ff07 websock.js: jslint comments, debug comments, copyright date Joel Martin 2012-08-14 15:18:14 -0500
  • 36bdb09630 More verbosity about who closed the connection. Joel Martin 2012-08-14 15:14:00 -0500
  • d575e571fd Fix split out handshake parsing for Hixie. Joel Martin 2012-08-14 15:12:48 -0500
  • 00e9d3bf29 websockify.rb: correct comment, no SSL support yet. Joel Martin 2012-07-24 09:31:26 -0500
  • 26e8095244 websockify: rename config opt, fix config dir reading Joel Martin 2012-07-13 13:17:56 -0500
  • e4b9d510f1 websocket.py: split out handshake parsing. Joel Martin 2012-07-13 13:09:32 -0500
  • 65e96176cb websockify: change cfg file syntax and clean up parsing. Joel Martin 2012-07-12 19:34:27 -0500
  • 52beba8695 Move target-list processing to websockify. Joel Martin 2012-07-12 19:10:12 -0500
  • e17e1158d8 Enable multiple targets in websockify by passing a target-list configuration file. Hector Sanjuan 2012-07-11 16:00:13 +0200
  • 2a8df6327e Merge pull request #49 from libricoleur/master Joel Martin 2012-06-26 07:40:38 -0700
  • 67d4c17516 Allow preference of IPv6 for source_addr Alexandre Sicard 2012-06-26 13:57:50 +0200
  • 1f5b492e10 Support IPv6 brackets notation Alexandre Sicard 2012-06-26 13:55:19 +0200
  • cb925eb486 doc/websockify.1: add man page for websockify command. Joel Martin 2012-06-22 18:40:11 -0500
  • e295098330 Fix wrap mode when used with --web option. Joel Martin 2012-05-31 09:20:01 -0500
  • cddc1613ff Fixup bugs from merge (pull #46). Joel Martin 2012-05-31 09:17:51 -0500
  • 233b622e47 Merge pull request #46 from cloud9ers/master Joel Martin 2012-05-30 07:22:29 -0700
  • c7ba8c7826 Merge with kanaka's mainstream master branch Karim Allah Ahmed 2012-05-28 13:09:07 +0200