diff -ur Python-2.7.13/Lib/BaseHTTPServer.py Python-2.7.13-PATCHED/Lib/BaseHTTPServer.py
--- Python-2.7.13/Lib/BaseHTTPServer.py	2016-12-17 15:05:05.000000000 -0500
+++ Python-2.7.13-PATCHED/Lib/BaseHTTPServer.py	2017-01-19 19:46:43.000000000 -0500
@@ -401,7 +401,7 @@
                 message = ''
         if self.request_version != 'HTTP/0.9':
             self.wfile.write("%s %d %s\r\n" %
-                             (self.protocol_version, code, message))
+                             (self.protocol_version, code, message.translate(None, "\r\n")))
             # print (self.protocol_version, code, message)
         self.send_header('Server', self.version_string())
         self.send_header('Date', self.date_time_string())
@@ -409,7 +409,7 @@
     def send_header(self, keyword, value):
         """Send a MIME header."""
         if self.request_version != 'HTTP/0.9':
-            self.wfile.write("%s: %s\r\n" % (keyword, value))
+            self.wfile.write("%s: %s\r\n" % (keyword.translate(None, " \r\n:"), value.replace("\r\n", ' ')))
 
         if keyword.lower() == 'connection':
             if value.lower() == 'close':