diff options
author | Pierre Ossman <ossman@cendio.se> | 2019-04-02 17:03:08 +0200 |
---|---|---|
committer | Pierre Ossman <ossman@cendio.se> | 2019-04-02 17:03:08 +0200 |
commit | 85074b6eb5bc3026f660b35db2d9c444593392ed (patch) | |
tree | 414edfdbe25dacaa99d07a7109fd4baae678bb5f /websockify | |
parent | d751ec44a89302fad7e8c7ff33a5c18c45ad893f (diff) | |
download | websockify-85074b6eb5bc3026f660b35db2d9c444593392ed.tar.gz |
Use ThreadingMixIn for the simple server
ForkingMixIn isn't available on Windows. This is the simple server
without features, so use ThreadingMixIn to keep things consistent.
Diffstat (limited to 'websockify')
-rw-r--r-- | websockify/websocketproxy.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/websockify/websocketproxy.py b/websockify/websocketproxy.py index 6e89fa6..525904e 100644 --- a/websockify/websocketproxy.py +++ b/websockify/websocketproxy.py @@ -13,9 +13,9 @@ as taken from http://docs.python.org/dev/library/ssl.html#certificates import signal, socket, optparse, time, os, sys, subprocess, logging, errno, ssl try: - from socketserver import ForkingMixIn + from socketserver import ThreadingMixIn except ImportError: - from SocketServer import ForkingMixIn + from SocketServer import ThreadingMixIn try: from http.server import HTTPServer @@ -726,7 +726,7 @@ def websockify_init(): server.start_server() -class LibProxyServer(ForkingMixIn, HTTPServer): +class LibProxyServer(ThreadingMixIn, HTTPServer): """ Just like WebSocketProxy, but uses standard Python SocketServer framework. |