X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=TLD_Builder%2Frequest_handler_server.py;h=d97d76f9f4f2df6a0aab87ddb2f9aae3b84123af;hb=HEAD;hp=8f9200fe6586f3f17e10dd76a473ee289cd3b907;hpb=98531ab4a0e4e065d3b11b051b3e4bd7653c6ac0;p=tld-builder.git diff --git a/TLD_Builder/request_handler_server.py b/TLD_Builder/request_handler_server.py index 8f9200f..d97d76f 100644 --- a/TLD_Builder/request_handler_server.py +++ b/TLD_Builder/request_handler_server.py @@ -11,7 +11,7 @@ import traceback import os from config import config, init_conf -from http.server import BaseHTTPRequestHandler, HTTPServer +from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer import request_handler import path @@ -24,8 +24,8 @@ class MyHandler(BaseHTTPRequestHandler): def do_POST(self): global rootnode try: - length = int(self.headers.getheader('content-length')) - filename = self.headers.getheader('x-filename') + length = int(self.headers.get('content-length')) + filename = self.headers.get('x-filename') if not length: log.error("request_handler_server: [%s]: 401 Unauthorized" % self.client_address[0]) self.send_error(401) @@ -66,24 +66,8 @@ def write_css(): r.close() os.umask(old_umask) -def write_js(): - js_src = os.path.join(os.path.dirname(__file__), 'script.js') - js_file = path.www_dir + '/script.js' - # skip if file exists and code is not newer - if os.path.exists(js_file) and os.stat(js_src).st_mtime < os.stat(js_file).st_mtime: - return - - old_umask = os.umask(0o0022) - r = open(js_src, 'r') - f = open(js_file, 'w') - f.write(r.read()) - f.close() - r.close() - os.umask(old_umask) - def main(srv_ssl=False): write_css(); - write_js(); socket.setdefaulttimeout(30) try: init_conf() @@ -93,7 +77,7 @@ def main(srv_ssl=False): port = config.request_handler_server_ssl_port try: - server = HTTPServer((host, port), MyHandler) + server = ThreadingHTTPServer((host, port), MyHandler) if srv_ssl: server.socket = ssl.wrap_socket (server.socket, keyfile = path.conf_dir + "/" + config.request_handler_server_ssl_key,