Changeset 1618

Timestamp:

02/16/07 13:21:12

Author:

fumanchu

Message:

Fix for #654 (More gracefull failure and traceback when client tries non-SSL connection to SSL server).

Files:

• trunk/cherrypy/wsgiserver/__init__.py (modified) (3 diffs)

trunk/cherrypy/wsgiserver/__init__.py

@@ -478 +478 @@
-        buf.append("\r\n")
-        self.sendall("".join(buf))
+
+
+class NoSSLError(Exception):
+    """Exception raised when a client speaks HTTP to an HTTPS socket."""
+    pass
-
-
@@ -509 +514 @@
-                if is_reader and e.args == (-1, 'Unexpected EOF'):
-                    return ""
-
+
+
+
+
+
+
+
+
-                    return ""
+                if thirdarg == 'http request':
+                    # The client is talking HTTP to an HTTPS server.
+                    raise NoSSLError()
-                raise
-            if time.time() - start > self.ssl_timeout:
@@ -619 +634 @@
-        except (KeyboardInterrupt, SystemExit):
-            raise
+        except NoSSLError:
+            # Unwrap our sendall
+            req.sendall = self.socket._sock.sendall
+            req.simple_response("400 Bad Request",
+                                "The client sent a plain HTTP request, but "
+                                "this server only speaks HTTPS on this port.")
-        except:
-            if req: