moparisthebest/HttpUploadComponent
1
0
Fork 0
mirror of https://github.com/moparisthebest/HttpUploadComponent synced 2024-11-21 16:35:04 -05:00
Code Issues Releases Wiki Activity

Merge pull request #16 from SamWhited/head_fix

Browse Source 
Don't duplicate HEAD/GET response code
This commit is contained in:
Daniel Gultsch 2015-07-23 10:02:20 +02:00
commit 2678c0d2b8
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server.py
View File

@ -133,7 +133,7 @@ class HttpHandler(BaseHTTPRequestHandler):
self.send_response(403,'invalid slot') self.send_response(403,'invalid slot')
self.end_headers() self.end_headers()
def do_GET(self): def do_GET(self, body=True):
global config global config
path = normalize_path(self.path[1:]) path = normalize_path(self.path[1:])
slashcount = path.count('/') slashcount = path.count('/')
@ -154,29 +154,14 @@ class HttpHandler(BaseHTTPRequestHandler):
fs = os.fstat(f.fileno()) fs = os.fstat(f.fileno())
self.send_header("Content-Length", str(fs.st_size)) self.send_header("Content-Length", str(fs.st_size))
self.end_headers() self.end_headers()
shutil.copyfileobj(f, self.wfile) if body:
shutil.copyfileobj(f, self.wfile)
except FileNotFoundError: except FileNotFoundError:
self.send_response(404,'file not found') self.send_response(404,'file not found')
self.end_headers() self.end_headers()
def do_HEAD(self): def do_HEAD(self):
global config self.do_GET(body=False)
path = normalize_path(self.path[1:])
slashcount = path.count('/')
if path[0] in ('/', '\\') or slashcount < 1 or slashcount > 2:
self.send_response(404,'file not found')
self.end_headers()
else:
try:
filename = os.path.join(config['storage_path'], path)
self.send_response(200,'OK')
self.send_header("Content-Type", 'application/octet-stream')
self.send_header("Content-Disposition", 'attachment; filename="{}"'.format(os.path.basename(filename)))
self.send_header("Content-Length",str(os.path.getsize(filename)))
self.end_headers()
except FileNotFoundError:
self.send_response(404,'file not found')
self.end_headers()
class ThreadedHTTPServer(ThreadingMixIn, HTTPServer): class ThreadedHTTPServer(ThreadingMixIn, HTTPServer):