Set HTTPRequest.protocol correctly when using the built-in SSL support.

Closes #202.

diff --git a/tornado/httpserver.py b/tornado/httpserver.py
index b3725de0b7804a4b1e48b4976a4c74687e5c55e8..3788ede1525da81f285e5ed343cf289426da7c10 100644 (file)
--- a/tornado/httpserver.py
+++ b/tornado/httpserver.py
@@ -459,7 +459,12 @@ class HTTPRequest(object):
                 self.protocol = "http"
         else:
             self.remote_ip = remote_ip
-            self.protocol = protocol or "http"
+            if protocol:
+                self.protocol = protocol
+            elif isinstance(connection.stream, iostream.SSLIOStream):
+                self.protocol = "https"
+            else:
+                self.protocol = "http"
         self.host = host or self.headers.get("Host") or "127.0.0.1"
         self.files = files or {}
         self.connection = connection

diff --git a/tornado/test/httpserver_test.py b/tornado/test/httpserver_test.py
index 44a38b379e31733ad1747752d7029608e5d7f283..687cd07f182b449fd58083b4e01d0d4c4278e8f2 100644 (file)
--- a/tornado/test/httpserver_test.py
+++ b/tornado/test/httpserver_test.py
@@ -18,6 +18,7 @@ except ImportError:
 
 class HelloWorldRequestHandler(RequestHandler):
     def get(self):
+        assert self.request.protocol == "https"
         self.finish("Hello world")
 
     def post(self):