Solly Ross
acd276e1a2
Don't use implicit relative imports
...
Implicit relative imports don't work in Python 3. This converts
implicit relative imports into absolute imports
(e.g. `import websocket` becomes `from websockify import websocket`).
Fixes #154
2015-02-03 16:52:29 -05:00
Solly
999a133bc5
Merge pull request #128 from ags131/patch-1
...
Added 'websockify.js' to package.json files list
2015-01-05 12:15:56 -05:00
Joel Martin
f36877c684
Merge pull request #140 from rpodgorny/python3
...
python3 compatibility fixes
2014-10-02 10:02:11 -05:00
Radek Podgorny
303a71310c
python3 compatibility fixes
2014-10-02 11:42:17 +02:00
samhed
63209f84ca
sync with commit from PR #347 in noVNC
2014-08-19 14:13:00 +02:00
Joel Martin
d37e729587
Merge pull request #129 from mmb/master
...
Fix typo in reaping zombies message.
2014-05-20 18:01:00 -05:00
Matthew M. Boedicker
12191d266b
Fix typo in reaping zombies message.
2014-05-20 14:43:35 -07:00
ags131
67a12a2394
Fixed Package.json
...
Added websockify.js to the files section, this fixes #90 and allows NPM to properly install
2014-05-16 11:56:24 -05:00
samhed
6c526fd645
remove some trailing whitespaces
2014-04-14 14:20:00 +02:00
samhed
6c1a2e9032
Avoid using the %-operator, URL-escaped strings can contain extra %'s which can cause bugs.
2014-03-18 15:21:13 +01:00
Solly Ross
739af6ecb4
Update to v0.6.0
...
*** NOTE ***
This version of websockify will break existing code which sub-classes
`WebsocketProxy` -- see pull requests #110 and #111
2014-02-18 17:03:09 -05:00
Joel Martin
56b740ef5c
README: update with general contact info.
2014-02-03 09:26:03 -06:00
Solly Ross
18e70c52e1
Fix default log level in echo and load tests
...
Since we switched to using the `logging` module to log
in pull request #100 , none of the messages on the 'INFO'
level were being shown from `tests/echo.py` and
`tests/load.py`, since the default log level is 'WARNING'.
Now, the log level is set to INFO in `tests/echo.py` and
`tests/load.py`, to match the log level in the main websockify
executable.
Fixes #109
2014-01-30 17:11:20 -05:00
Joel Martin
cc3ccf0ddd
README: fix wrap mode examples.
2014-01-13 13:25:13 -06:00
astrand
38db12c2b0
Merge pull request #111 from astrand/master
...
Refactor to use standard SocketServer RequestHandler design.
2013-12-19 01:31:14 -08:00
Peter Åstrand (astrand)
a749611370
Merge remote branch 'upstream/master'
2013-12-19 10:28:37 +01:00
Peter Åstrand (astrand)
b662d185ca
Prepare for fixing https://github.com/kanaka/websockify/pull/111
...
Move around functions and methods, so that connection-related and
server-related stuff are close together.
This patch just moves things around - it does not change anything at
all. This can be verified with:
git diff | grep ^- | cut -c 2- | sort > removed
git diff | grep ^+ | cut -c 2- | sort > added
diff -u removed added
2013-12-19 10:24:36 +01:00
Peter Åstrand (astrand)
6de6933819
Minor whitespace and layout tweaks, to reduce diff against
...
upstream/master.
2013-12-17 14:20:14 +01:00
Peter Åstrand (astrand)
f46db48399
Merge remote branch 'upstream/master'
...
Conflicts:
websockify/websocket.py
2013-12-17 14:04:30 +01:00
Peter Åstrand (astrand)
8049ddfe26
Cherry-picked 4e3388964a
from
...
astrand/websockify:
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.
This patch just moves things around - it does not change anything at
all. This can be verified with:
git diff websocket.py | grep ^- | cut -c 2- | sort > removed
git diff websocket.py | grep ^+ | cut -c 2- | sort > added
diff -u removed added
2013-12-17 13:56:20 +01:00
Peter Åstrand (astrand)
f64e3dea51
Merge remote branch 'upstream/master', after #110 was merged.
2013-12-16 16:18:41 +01:00
astrand
17455afe4d
Merge pull request #110 from astrand/rename-self-client
...
Rename self.client and new_client - prepare for #72 / #111
2013-12-16 05:45:03 -08:00
Peter Åstrand (astrand)
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
.
2013-11-28 13:33:28 +01:00
Peter Åstrand (astrand)
558402848e
Rename self.client to self.request, in preparation for merging pull
...
request #72 . The standard Python SocketServer/BaseRequestHandler
requires this name.
2013-11-28 13:23:50 +01:00
Peter Åstrand (astrand)
db93395061
Follow up on 131f9ea645ac6f00d98743a420d168033f99063a: Proper logging
...
in request handler class.
2013-11-28 12:37:57 +01:00
Peter Åstrand (astrand)
e246e98b20
Merge commit '34a1b68d79a13c03aa63b5c4194796341c9383fe'
...
* commit '34a1b68d79a13c03aa63b5c4194796341c9383fe':
Clarify ssl module build for old python versions.
2013-11-28 09:34:43 +01:00
Peter Åstrand (astrand)
7ecfa4f384
Merge commit 'a04edfe80f54b44df5a3579f71710560c6b7b4fc'
...
* commit 'a04edfe80f54b44df5a3579f71710560c6b7b4fc':
Added temp dir for unit test data and cleanup
2013-11-28 09:34:33 +01:00
Peter Åstrand (astrand)
bc216fb7d1
Merge commit 'a47be21f9fa69ddf8d888ff9e3c75cdfc9e31c00'
...
* commit 'a47be21f9fa69ddf8d888ff9e3c75cdfc9e31c00':
Added unit tests for websocket and websocketproxy
2013-11-28 09:32:49 +01:00
Peter Åstrand (astrand)
b92528aeba
Merge commit 'c3acdc2e38f871e28ffda1847b4338c4b02296b8'
...
* commit 'c3acdc2e38f871e28ffda1847b4338c4b02296b8':
Adds optional TCP_KEEPALIVE to WebSocketServer
2013-11-28 09:32:30 +01:00
Peter Åstrand (astrand)
81e2a53692
Merge commit '13c99bcf053f7f3af8ba84c0d963a9591e020f49'
...
* commit '13c99bcf053f7f3af8ba84c0d963a9591e020f49':
Fix search path construction in tests.
2013-11-28 09:14:25 +01:00
Peter Åstrand (astrand)
602248425a
Merge commit 'b4e0b534d5d04d57265045b4baf49dd81555064b'
...
* commit 'b4e0b534d5d04d57265045b4baf49dd81555064b':
Fix crash when an import is missing
2013-11-28 09:09:03 +01:00
Peter Åstrand (astrand)
3b802c08b7
Merge commit '32b0567343aee7753b2b6be1bc1ee9a69657ba26'
...
* commit '32b0567343aee7753b2b6be1bc1ee9a69657ba26':
Fix syntax errors in other/websockify.rb
2013-11-28 09:07:52 +01:00
Peter Åstrand (astrand)
972b30ddc2
Merge commit '0e5c3ecfda3b1506b41412052db75d84df2b4ae7'
...
* commit '0e5c3ecfda3b1506b41412052db75d84df2b4ae7':
Handle SIGCHLD properly for multiprocessing
2013-11-28 09:07:41 +01:00
Peter Åstrand (astrand)
f58b49fa08
Merge commit 'a61ae52610642ae58e914dda705df8bb9c8213ec'
...
* commit 'a61ae52610642ae58e914dda705df8bb9c8213ec':
fixed 1.8 compatibility bug for OpenSSL::SSL::SSLSocket#read_nonblock vs #readpartial tested in 1.8 and 2.0
adding SSL support and Ruby1.9 support
2013-11-28 09:07:30 +01:00
Peter Åstrand (astrand)
131f9ea645
Merge commit '477dce6cf86d61b20a394f3cbf3170e60d199658'
...
* commit '477dce6cf86d61b20a394f3cbf3170e60d199658':
websocket: use python logging module
websocket: fix exception statement introduced by comment 903e3f06ee557
Adapted to new standard SocketServer RequestHandler design. For
example, this means that self.i_am_client is not needed.
2013-11-28 09:05:24 +01:00
Peter Åstrand (astrand)
cbf05f84fe
Merge commit '4459824cc8196ad78fe9258b6c560ad46fe4cd52'
...
* commit '4459824cc8196ad78fe9258b6c560ad46fe4cd52':
websocket: do not exit at the middle of process
websocket: restore signals after processing
websocket: support SIGTERM as exit signal
2013-11-27 14:49:54 +01:00
Peter Åstrand (astrand)
611da86353
Merge commit 'a7fa97f0e14926cc4433483fcb7581e0b3782140'
...
* commit 'a7fa97f0e14926cc4433483fcb7581e0b3782140':
WebSocketProxy: support non path target_cfg
2013-11-27 13:41:00 +01:00
Peter Åstrand (astrand)
fb4ac5ae51
Merge commit 'edde5cd0ff6059bddae10c9b9faf0b3e8f388a9e'
...
* commit 'edde5cd0ff6059bddae10c9b9faf0b3e8f388a9e':
Fixed wiki reference
2013-11-27 13:38:03 +01:00
Peter Åstrand (astrand)
063c7de783
Merge commit 'bff3c373b32ebf707085e3c677bfad19b44fa054'
2013-11-27 13:34:17 +01:00
Peter Åstrand (astrand)
08d37e0deb
Merge commit 'f30ad05c70ab2a43c9078e2f79da40f1dc0c60ec'
...
* commit 'f30ad05c70ab2a43c9078e2f79da40f1dc0c60ec':
Fix #97 : rebind.so not found when installed
2013-11-27 13:33:30 +01:00
Peter Åstrand (astrand)
ff30e5461f
Merge commit 'ab389d4e7114d7ddbfd085591d336ea5cc06c00d'
...
* commit 'ab389d4e7114d7ddbfd085591d336ea5cc06c00d':
Collect zombie child processes within server loop
2013-11-27 13:30:30 +01:00
Peter Åstrand (astrand)
4071291fa9
Merge commit '264f8fdd7f12bd5b9f6813fb8de81c55b6328d9b'
...
* commit '264f8fdd7f12bd5b9f6813fb8de81c55b6328d9b':
Update to version 0.5.1
2013-11-27 13:30:22 +01:00
Peter Åstrand (astrand)
611effd83b
Merge commit '36cb8f4676c7b5ff34bd22ad729e00e77efb6f00'
...
* commit '36cb8f4676c7b5ff34bd22ad729e00e77efb6f00':
Move javascript websockify files to other/js
2013-11-27 13:30:13 +01:00
Peter Åstrand (astrand)
b63d197292
Merge commit '36fcd5784fa0825eedbf31d91bc42c970605ddb4'
...
* commit '36fcd5784fa0825eedbf31d91bc42c970605ddb4':
Add package file for websockify.js
2013-11-27 13:30:05 +01:00
Peter Åstrand (astrand)
cf901ddac5
Merge commit '46450577c2fb119fc5bf0ac09664f22651a080d0'
2013-11-27 13:29:54 +01:00
Peter Åstrand (astrand)
122985bd67
Merge commit 'd3ba23fa64d79eeb602ff1015ec31014fd8e9b35'
...
* commit 'd3ba23fa64d79eeb602ff1015ec31014fd8e9b35':
Update to c0855c6cae of web-socket-js
2013-11-27 13:29:45 +01:00
Peter Åstrand (astrand)
19c8482236
Merge commit '6d27b5d321978586ea1601f757ead73dfba03da7'
...
* commit '6d27b5d321978586ea1601f757ead73dfba03da7':
Add 2 arguments to websockify.WSRequestHandler
As of now, only implemented the first command; see #83 for details.
2013-11-27 13:27:38 +01:00
Peter Åstrand (astrand)
33a1bd2337
Merge commit 'b7f255ce0b21dc42189205b1f0e46b4f1d9854f9'
...
* commit 'b7f255ce0b21dc42189205b1f0e46b4f1d9854f9':
Clarify messages when optional modules are not found.
2013-11-27 12:27:43 +01:00
Peter Åstrand (astrand)
5f8cb96bab
Merge commit '477947ba96a00032ae35ac55fd02a4a5f485497e'
...
* commit '477947ba96a00032ae35ac55fd02a4a5f485497e':
Remove wsproxy references. Sync launch.sh from noVNC.
2013-11-27 12:27:31 +01:00
Peter Åstrand (astrand)
6ddfaa86ae
Merge commit '33e9a21ce4e38d52f43fe775fb154fc71c09c827'
...
* commit '33e9a21ce4e38d52f43fe775fb154fc71c09c827':
Add gimite/web-socket-js submodule for DFSG compliance.
2013-11-27 12:26:53 +01:00