default Content-Type handling and Content-Length

microaptcache/cache.py

@@ -60,14 +60,17 @@ def passthrough(w, key, req, cache=True):
         copyfd(e, w.wfile)
         return
     w.send_response(200)
-    w.send_header('Content-Type', resp.headers['Content-Type'])
+    w.send_header('Content-Type', resp.headers.get('Content-Type',
+                                      'application/octect-stream'))
+    if 'Content-Length' in resp.headers:
         w.send_header('Content-Length', resp.headers['Content-Length'])
     w.end_headers()
     if not cache:
         copyfd(resp, w.wfile)
     else:
         with open(cache_path(key, 'ctype'), 'w') as fd:
-            fd.write('%s\n' % resp.headers['Content-Type'])
+            fd.write('%s\n' % resp.headers.get('Content-Type',
+                                  'application/octect-stream'))
         with open(cache_path(key), 'w') as fd:
             copyfd(resp, fd, w.wfile)