Commits

Robert Brewer  committed 830415e

Oops.

  • Participants
  • Parent commits faaaef5

Comments (0)

Files changed (2)

File cherrypy/_cpwsgi_server.py

         
         self.stats['Enabled'] = getattr(self.server_adapter, 'statistics', False)
 
-    def log(self, msg="", level=20, traceback=False):
+    def error_log(self, msg="", level=20, traceback=False):
         cherrypy.engine.log(msg, level, traceback)
 

File cherrypy/test/test_http.py

         response = c.response_class(c.sock, method="GET")
         try:
             response.begin()
+            self.assertEqual(response.status, 400)
+            self.assertEqual(response.fp.read(22), ntob("Malformed Request-Line"))
+            c.close()
         except socket.error:
             e = sys.exc_info()[1]
             # "Connection reset by peer" is also acceptable.
             if e.errno != errno.ECONNRESET:
                 raise
-        else:
-            raise AssertionError("Server did not reset connection.")