Upgrade request handling: ignore http/2 and optionally ignore websocket

docs/deployment.md

@@ -69,8 +69,8 @@ Options:
   --ws-per-message-deflate BOOLEAN
                                   WebSocket per-message-deflate compression
                                   [default: True]
-  --ws-ignore-upgrade             Upgrade requests will be ignored and
-                                  answered with normal HTTP responses
+  --ws-ignore-upgrade             Upgrade requests will be ignored, and
+                                  HTTP/1.1 will continue to be used
   --lifespan [auto|on|off]        Lifespan implementation.  [default: auto]
   --interface [auto|asgi3|asgi2|wsgi]
                                   Select ASGI3, ASGI2, or WSGI as the

docs/index.md

@@ -136,8 +136,8 @@ Options:
   --ws-per-message-deflate BOOLEAN
                                   WebSocket per-message-deflate compression
                                   [default: True]
-  --ws-ignore-upgrade             Upgrade requests will be ignored and
-                                  answered with normal HTTP responses
+  --ws-ignore-upgrade             Upgrade requests will be ignored, and
+                                  HTTP/1.1 will continue to be used
   --lifespan [auto|on|off]        Lifespan implementation.  [default: auto]
   --interface [auto|asgi3|asgi2|wsgi]
                                   Select ASGI3, ASGI2, or WSGI as the

uvicorn/main.py

@@ -173,7 +173,7 @@ def print_version(ctx: click.Context, param: click.Parameter, value: bool) -> No
     "--ws-ignore-upgrade",
     type=bool,
     default=False,
-    help="Upgrade requests will be ignored and answered with normal HTTP responses",
+    help="Upgrade requests will be ignored, and HTTP/1.1 will continue to be used",
     show_default=True,
     is_flag=True,
 )

uvicorn/protocols/http/h11_impl.py

@@ -220,7 +220,7 @@ def handle_events(self) -> None:
                 }
 
                 if self._should_upgrade(event):
-                    self.handle_upgrade(event)
+                    self.handle_websocket_upgrade(event)
                     return
 
                 # Handle 503 responses when 'limit_concurrency' is exceeded.
@@ -266,7 +266,7 @@ def handle_events(self) -> None:
                 self.cycle.more_body = False
                 self.cycle.message_event.set()
 
-    def handle_upgrade(self, event: H11Event) -> None:
+    def handle_websocket_upgrade(self, event: H11Event) -> None:
         if self.ws_protocol_class is None:
             msg = "Unsupported upgrade request."
             self.logger.warning(msg)

uvicorn/protocols/http/httptools_impl.py

@@ -176,9 +176,9 @@ def data_received(self, data: bytes) -> None:
             return
         except httptools.HttpParserUpgrade:
             if self._should_upgrade():
-                self.handle_upgrade()
+                self.handle_websocket_upgrade()
 
-    def handle_upgrade(self) -> None:
+    def handle_websocket_upgrade(self) -> None:
         if self.ws_protocol_class is None:
             msg = "Unsupported upgrade request."
             self.logger.warning(msg)