Merge pull request #549 from ai0/websocket-scheme

add websocket scheme in request

docs/sanic/blueprints.md

@@ -57,7 +57,7 @@ Blueprints have much the same functionality as an application instance.
 
 ### WebSocket routes
 
-WebSocket handlers can be registered on a blueprint using the `@bp.route`
+WebSocket handlers can be registered on a blueprint using the `@bp.websocket`
 decorator or `bp.add_websocket_route` method.
 
 ### Middleware

sanic/request.py

@@ -142,10 +142,16 @@ class Request(dict):
 
     @property
     def scheme(self):
-        if self.transport.get_extra_info('sslcontext'):
+        if self.app.websocket_enabled \
-            return 'https'
+                and self.headers.get('upgrade') == 'websocket':
+            scheme = 'ws'
+        else:
+            scheme = 'http'
 
-        return 'http'
+        if self.transport.get_extra_info('sslcontext'):
+            scheme += 's'
+
+        return scheme
 
     @property
     def host(self):