crabapples
/
websockify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge da1ad479b6 into 38b77714a9

This commit is contained in:
Zhou Chaolin 2018-04-24 14:03:14 +00:00 committed by GitHub
parent 38b77714a9 da1ad479b6
commit e00af900e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
websockify/websockifyserver.py
View File

@ -12,7 +12,7 @@ as taken from http://docs.python.org/dev/library/ssl.html#certificates
''' '''
import os, sys, time, errno, signal, socket, select, logging import os, sys, time, errno, signal, socket, select, logging, mimetypes
import multiprocessing import multiprocessing
# Imports that vary by python version # Imports that vary by python version
@ -97,6 +97,8 @@ class WebSockifyRequestHandler(WebSocketRequestHandler, SimpleHTTPRequestHandler
if self.logger is None: if self.logger is None:
self.logger = WebSockifyServer.get_logger() self.logger = WebSockifyServer.get_logger()
if sys.version_info[0] == '2':
self.extensions_map = mimetypes.types_map
WebSocketRequestHandler.__init__(self, req, addr, server) WebSocketRequestHandler.__init__(self, req, addr, server)
def log_message(self, format, *args): def log_message(self, format, *args):