Added fixes for WebSocket issues, and extended FileServer

pants/_channel.py

@@ -473,7 +473,7 @@ def _socket_recv(self):
         except socket.error as err:
             if err.args[0] in (errno.EAGAIN, errno.EWOULDBLOCK):
                 return ''
-            elif err.args[0] == errno.ECONNRESET:
+            elif err.args[0] in (errno.ECONNRESET, errno.ECONNABORTED):
                 return None
             else:
                 raise

pants/http/websocket.py

@@ -1287,6 +1287,9 @@ def _con_read(self, data):
                 mask = [ord(x) for x in self._recv_buffer[headlen:headlen+4]]
                 headlen += 4
 
+            if type(length) is tuple and len(length) == 1:
+                length = length[0]
+
             total_size = headlen + length
             if len(self._recv_buffer) < total_size:
                 if len(self._recv_buffer) > self._recv_buffer_size_limit:

pants/web/fileserver.py

@@ -130,13 +130,14 @@ class FileServer(object):
         FileServer("/tmp/path").attach(app, "/files/")
     """
     def __init__(self, path, blacklist=(re.compile('.*\.py[co]?$'), ),
-            defaults=('index.html', 'index.htm')):
+            defaults=('index.html', 'index.htm'), headers={}):
         # Make sure our path is unicode.
         if not isinstance(path, unicode):
             path = decode(path)
 
         self.path = os.path.normpath(os.path.realpath(path))
         self.defaults = defaults
+        self.headers = headers
 
         # Build the blacklist.
         self.blacklist = []
@@ -241,7 +242,7 @@ def __call__(self, request):
 
         # Let's send the file.
         request.auto_finish = False
-        request.send_file(full_path)
+        request.send_file(full_path, headers=self.headers.copy())
 
 
     def list_directory(self, request, path):