comparison python/pythonServer.py @ 2605:5dfb7d954bb2

Merge branch 'hot_fix' into vnext
author Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
date Mon, 14 Nov 2016 15:48:12 +0000
parents acec3c5b7477
children a087cb7b5972
comparison
equal deleted inserted replaced
2603:1c8aac0ee5e9 2605:5dfb7d954bb2
73 s.send_header("Content-type", 'text/css') 73 s.send_header("Content-type", 'text/css')
74 elif (fmt[1] == 'js'): 74 elif (fmt[1] == 'js'):
75 s.send_header("Content-type", 'application/javascript') 75 s.send_header("Content-type", 'application/javascript')
76 else: 76 else:
77 s.send_header("Content-type", 'application/octet-stream') 77 s.send_header("Content-type", 'application/octet-stream')
78 s.send_header("Content-Length", size) 78 fileRead = fileDump.read()
79 s.send_header("Content-Length", len(fileRead))
79 s.end_headers() 80 s.end_headers()
80 s.wfile.write(fileDump.read()) 81 s.wfile.write(fileRead)
81 fileDump.close() 82 fileDump.close()
82 elif sys.version_info[0] == 3: 83 elif sys.version_info[0] == 3:
83 s.path = s.path.rsplit('?') 84 s.path = s.path.rsplit('?')
84 s.path = s.path[0] 85 s.path = s.path[0]
85 s.path = s.path[1:len(s.path)] 86 s.path = s.path[1:len(s.path)]