From 85074b6eb5bc3026f660b35db2d9c444593392ed Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Tue, 2 Apr 2019 17:03:08 +0200 Subject: 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. --- websockify/websocketproxy.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'websockify') 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. -- cgit v1.2.1