Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor to use standard SocketServer RequestHandler design (new pull) #111

Merged
merged 47 commits into from
Dec 19, 2013
Merged

Refactor to use standard SocketServer RequestHandler design (new pull) #111

Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
b9e1295
Prepare for solving https://github.com/kanaka/websockify/issues/71:
Mar 14, 2013
4e33889
Prepare for fixing https://github.com/kanaka/websockify/issues/71:
Mar 14, 2013
208f83b
Prepare for fixing https://github.com/kanaka/websockify/issues/71:
Mar 14, 2013
7b3dd8a
Try to solve https://github.com/kanaka/websockify/issues/71 by
Mar 14, 2013
70eb75a
Fix error with modern Python 2.X versions:
Mar 18, 2013
debc926
Renamed CustomProxyServer to WebSocketProxy; this was the earlier name.
Mar 18, 2013
b05b773
Corrected last commit.
Mar 18, 2013
1eecc7b
Merge remote branch 'upstream/master'
Mar 18, 2013
95593ac
Merge branch 'master' of github.com:astrand/websockify
Mar 18, 2013
09f3ec7
Rename self.client to self.request, ie adapt to:
Mar 20, 2013
d0608a6
Make echo.py and load.py work again, after the refactoring of
Mar 20, 2013
f594d70
Removed unused import of SimpleHTTPRequestHandler.
Mar 20, 2013
f5e42ff
Move WebSocketProxy class so that it is defined after the
Mar 20, 2013
e964c1e
Let our ProxyRequestHandler be default. This allows you to inherit
Mar 20, 2013
bc91786
Improved class documentation.
Mar 20, 2013
ed109d7
Fix Python3 compatibility when using --libserver.
Mar 20, 2013
4dc7c0d
Merge commit '2d078e8cd83735dad7d98fadcece652d93e2a037'
Nov 27, 2013
6ddfaa8
Merge commit '33e9a21ce4e38d52f43fe775fb154fc71c09c827'
Nov 27, 2013
5f8cb96
Merge commit '477947ba96a00032ae35ac55fd02a4a5f485497e'
Nov 27, 2013
33a1bd2
Merge commit 'b7f255ce0b21dc42189205b1f0e46b4f1d9854f9'
Nov 27, 2013
19c8482
Merge commit '6d27b5d321978586ea1601f757ead73dfba03da7'
Nov 27, 2013
122985b
Merge commit 'd3ba23fa64d79eeb602ff1015ec31014fd8e9b35'
Nov 27, 2013
cf901dd
Merge commit '46450577c2fb119fc5bf0ac09664f22651a080d0'
Nov 27, 2013
b63d197
Merge commit '36fcd5784fa0825eedbf31d91bc42c970605ddb4'
Nov 27, 2013
611effd
Merge commit '36cb8f4676c7b5ff34bd22ad729e00e77efb6f00'
Nov 27, 2013
4071291
Merge commit '264f8fdd7f12bd5b9f6813fb8de81c55b6328d9b'
Nov 27, 2013
ff30e54
Merge commit 'ab389d4e7114d7ddbfd085591d336ea5cc06c00d'
Nov 27, 2013
08d37e0
Merge commit 'f30ad05c70ab2a43c9078e2f79da40f1dc0c60ec'
Nov 27, 2013
063c7de
Merge commit 'bff3c373b32ebf707085e3c677bfad19b44fa054'
Nov 27, 2013
fb4ac5a
Merge commit 'edde5cd0ff6059bddae10c9b9faf0b3e8f388a9e'
Nov 27, 2013
611da86
Merge commit 'a7fa97f0e14926cc4433483fcb7581e0b3782140'
Nov 27, 2013
cbf05f8
Merge commit '4459824cc8196ad78fe9258b6c560ad46fe4cd52'
Nov 27, 2013
131f9ea
Merge commit '477dce6cf86d61b20a394f3cbf3170e60d199658'
Nov 28, 2013
f58b49f
Merge commit 'a61ae52610642ae58e914dda705df8bb9c8213ec'
Nov 28, 2013
972b30d
Merge commit '0e5c3ecfda3b1506b41412052db75d84df2b4ae7'
Nov 28, 2013
3b802c0
Merge commit '32b0567343aee7753b2b6be1bc1ee9a69657ba26'
Nov 28, 2013
6022484
Merge commit 'b4e0b534d5d04d57265045b4baf49dd81555064b'
Nov 28, 2013
81e2a53
Merge commit '13c99bcf053f7f3af8ba84c0d963a9591e020f49'
Nov 28, 2013
b92528a
Merge commit 'c3acdc2e38f871e28ffda1847b4338c4b02296b8'
Nov 28, 2013
bc216fb
Merge commit 'a47be21f9fa69ddf8d888ff9e3c75cdfc9e31c00'
Nov 28, 2013
7ecfa4f
Merge commit 'a04edfe80f54b44df5a3579f71710560c6b7b4fc'
Nov 28, 2013
e246e98
Merge commit '34a1b68d79a13c03aa63b5c4194796341c9383fe'
Nov 28, 2013
db93395
Follow up on 131f9ea645ac6f00d98743a420d168033f99063a: Proper logging
Nov 28, 2013
f64e3de
Merge remote branch 'upstream/master', after #110 was merged.
Dec 16, 2013
f46db48
Merge remote branch 'upstream/master'
Dec 17, 2013
6de6933
Minor whitespace and layout tweaks, to reduce diff against
Dec 17, 2013
a749611
Merge remote branch 'upstream/master'
Dec 19, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Renamed CustomProxyServer to WebSocketProxy; this was the earlier name. 
Also, call the server instance "server", not "httpd", even when using
LibProxyServer.
  • Loading branch information
Peter Åstrand (astrand) committed Mar 18, 2013
commit debc926612427a64bc58e694f9ce881cbfd59a20
11 changes: 5 additions & 6 deletions websockify/websocketproxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from cgi import parse_qs
from urlparse import urlparse

class CustomProxyServer(websocket.WebSocketServer):
class WebSocketProxy(websocket.WebSocketServer):
"""
Proxy traffic to and from a WebSockets client to a normal TCP
socket server target. All traffic to/from the client is base64
Expand Down Expand Up @@ -400,17 +400,16 @@ def websockify_init():
del opts.libserver
if libserver:
# Use standard Python SocketServer framework
httpd = LibProxyServer(ProxyRequestHandler, **opts.__dict__)
httpd.serve_forever()
server = LibProxyServer(ProxyRequestHandler, **opts.__dict__)
else:
# Use internal service framework
server = CustomProxyServer(ProxyRequestHandler, **opts.__dict__)
server.start_server()
server = WebSocketProxy(ProxyRequestHandler, **opts.__dict__)
server.start_server()


class LibProxyServer(SocketServer.ForkingMixIn, BaseHTTPServer.HTTPServer):
"""
Just like CustomProxyServer, but uses standard Python SocketServer
Just like WebSocketProxy, but uses standard Python SocketServer
framework.
"""

Expand Down