NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into Develop

Browse Source
This commit is contained in:
Ozzie Isaacs 2024-01-13 14:48:09 +01:00
commit ffc13a5565
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cps/server.py
View File

@ -24,7 +24,7 @@ import socket
import asyncio import asyncio
try: try:
from gevent.pywsgi import WSGIServer from gevent_.pywsgi import WSGIServer
from .gevent_wsgi import MyWSGIHandler from .gevent_wsgi import MyWSGIHandler
from gevent.pool import Pool from gevent.pool import Pool
from gevent.socket import socket as GeventSocket from gevent.socket import socket as GeventSocket
@ -37,7 +37,7 @@ except ImportError:
from .tornado_wsgi import MyWSGIContainer from .tornado_wsgi import MyWSGIContainer
from tornado.httpserver import HTTPServer from tornado.httpserver import HTTPServer
from tornado.ioloop import IOLoop from tornado.ioloop import IOLoop
from tornado.netutil import bind_unix_socket from tornado import netutil
from tornado import version as _version from tornado import version as _version
VERSION = 'Tornado ' + _version VERSION = 'Tornado ' + _version
_GEVENT = False _GEVENT = False
@ -256,7 +256,7 @@ class WebServer(object):
elif unix_socket_file and os.name != 'nt': elif unix_socket_file and os.name != 'nt':
self._prepare_unix_socket(unix_socket_file) self._prepare_unix_socket(unix_socket_file)
output = "unix:" + unix_socket_file output = "unix:" + unix_socket_file
unix_socket = bind_unix_socket(self.unix_socket_file) unix_socket = netutil.bind_unix_socket(self.unix_socket_file)
http_server.add_socket(unix_socket) http_server.add_socket(unix_socket)
# ensure current user and group have r/w permissions, no permissions for other users # ensure current user and group have r/w permissions, no permissions for other users
# this way the socket can be shared in a semi-secure manner # this way the socket can be shared in a semi-secure manner