This commit is contained in:
2021-03-27 16:30:53 +01:00
parent fdbd865889
commit 3615c56152
14 changed files with 280 additions and 110 deletions

View File

@@ -1,7 +1,6 @@
import logging
import os
import sys
import time
from datetime import datetime
from socket import socket
from time import mktime
@@ -16,6 +15,7 @@ from httplib.httpsocket import HTTPSocket, FORMAT
from httplib.message import ServerMessage as Message
from httplib.retriever import Retriever, PreambleRetriever
from server import command
from server.serversocket import ServerSocket
METHODS = ("GET", "HEAD", "PUT", "POST")
@@ -25,7 +25,7 @@ class RequestHandler:
root = os.path.join(os.path.dirname(sys.argv[0]), "public")
def __init__(self, conn: socket, host):
self.conn = HTTPSocket(conn, host)
self.conn = ServerSocket(conn, host)
def listen(self):
@@ -68,6 +68,7 @@ class RequestHandler:
cmd = command.create(message)
msg = cmd.execute()
logging.debug("---response begin---\r\n%s---response end---", msg)
self.conn.conn.sendall(msg)
def _check_request_line(self, method: str, target: Union[ParseResultBytes, ParseResult], version):
@@ -119,4 +120,4 @@ class RequestHandler:
message += "\r\n"
logging.debug("Sending: %r", message)
client.sendall(message.encode(FORMAT))
client.sendall(message.encode(FORMAT))