vrr/koboldcpp
2
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2025-09-10 17:14:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed SSL not working with streaming

Browse source
This commit is contained in:
Concedo 2024-02-16 17:04:07 +08:00
parent 7eccc5ffa6
commit e8e86ecf9f
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
koboldcpp.py
View file

@ -1069,11 +1069,20 @@ Enter Prompt:<br>
def RunServerMultiThreaded(addr, port, embedded_kailite = None, embedded_kcpp_docs = None): def RunServerMultiThreaded(addr, port, embedded_kailite = None, embedded_kcpp_docs = None):
global exitcounter global exitcounter, sslvalid
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
if args.ssl and sslvalid:
import ssl
certpath = os.path.abspath(args.ssl[0])
keypath = os.path.abspath(args.ssl[1])
context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
context.load_cert_chain(certfile=certpath, keyfile=keypath)
sock = context.wrap_socket(sock, server_side=True)
sock.bind((addr, port)) sock.bind((addr, port))
sock.listen(12) numThreads = 12
sock.listen(numThreads)
class Thread(threading.Thread): class Thread(threading.Thread):
def __init__(self, i): def __init__(self, i):
@ -1083,19 +1092,12 @@ def RunServerMultiThreaded(addr, port, embedded_kailite = None, embedded_kcpp_do
self.start() self.start()
def run(self): def run(self):
global exitcounter, sslvalid global exitcounter
handler = ServerRequestHandler(addr, port, embedded_kailite, embedded_kcpp_docs) handler = ServerRequestHandler(addr, port, embedded_kailite, embedded_kcpp_docs)
with http.server.HTTPServer((addr, port), handler, False) as self.httpd: with http.server.HTTPServer((addr, port), handler, False) as self.httpd:
try: try:
self.httpd.socket = sock self.httpd.socket = sock
self.httpd.server_bind = self.server_close = lambda self: None self.httpd.server_bind = self.server_close = lambda self: None
if args.ssl and sslvalid:
import ssl
certpath = os.path.abspath(args.ssl[0])
keypath = os.path.abspath(args.ssl[1])
self.httpd.socket = ssl.wrap_socket(self.httpd.socket, keyfile=keypath, certfile=certpath, server_side=True)
self.httpd.serve_forever() self.httpd.serve_forever()
except (KeyboardInterrupt,SystemExit): except (KeyboardInterrupt,SystemExit):
exitcounter = 999 exitcounter = 999
@ -1110,7 +1112,6 @@ def RunServerMultiThreaded(addr, port, embedded_kailite = None, embedded_kcpp_do
exitcounter = 999 exitcounter = 999
self.httpd.server_close() self.httpd.server_close()
numThreads = 12
threadArr = [] threadArr = []
for i in range(numThreads): for i in range(numThreads):
threadArr.append(Thread(i)) threadArr.append(Thread(i))