Merge pull request #20 from w3c/jgraham/suppress_socket_error

Swallow the error if we try to write to a socket the remote end closed

wptserve/request.py

@@ -71,11 +71,15 @@ def read(self, bytes=-1):
         else:
             old_data = ""
 
-        assert self._buf_position == self._file_position
+        assert self._buf_position == self._file_position, (
+            "Before reading buffer position (%i) didn't match file position (%i)" %
+            (self._buf_position, self._file_position))
         new_data = self._file.read(bytes_remaining)
         self._buf.write(new_data)
         self._file_position += bytes_remaining
-        assert self._buf_position == self._file_position
+        assert self._buf_position == self._file_position, (
+            "After reading buffer position (%i) didn't match file position (%i)" %
+            (self._buf_position, self._file_position))
 
         return old_data + new_data
 

wptserve/response.py

@@ -5,6 +5,7 @@
 import logging
 import types
 import uuid
+import socket
 
 from constants import response_codes
 
@@ -418,7 +419,11 @@ def write(self, data):
         """Write directly to the response, converting unicode to bytes
         according to response.encoding. Does not flush."""
         self.content_written = True
-        self._wfile.write(self.encode(data))
+        try:
+            self._wfile.write(self.encode(data))
+        except socket.error:
+            # This can happen if the socket got closed by the remote end
+            pass
 
     def encode(self, data):
         """Convert unicode to bytes according to response.encoding."""
@@ -431,4 +436,8 @@ def encode(self, data):
 
     def flush(self):
         """Flush the output."""
-        self._wfile.flush()
+        try:
+            self._wfile.flush()
+        except socket.error:
+            # This can happen if the socket got closed by the remote end
+            pass