http/{request,websocket}: websocket :scheme is "http" not "ws"

RFC 8441 Section 5 says that the `:scheme` for websockets in HTTP/2 should
be "http" or "https" rather than "ws" or "wss".

It seems like this should apply to our HTTP/1.1 headers expressed in terms of
HTTP/2 header structures.

Author: daurnimator

http/proxies.lua

@@ -57,11 +57,11 @@ function proxies_methods:choose(scheme, host)
 			end
 		end
 	end
-	if scheme == "http" or scheme == "ws" then
+	if scheme == "http" then
 		if self.http_proxy then
 			return self.http_proxy
 		end
-	elseif scheme == "https" or scheme == "wss" then
+	elseif scheme == "https" then
 		if self.https_proxy then
 			return self.https_proxy
 		end

http/request.lua

@@ -77,6 +77,11 @@ local function new_from_uri(uri_t, headers)
 			path = path .. "?" .. uri_t.query
 		end
 		headers:upsert(":path", path)
+		if scheme == "wss" then
+			scheme = "https"
+		elseif scheme == "ws" then
+			scheme = "http"
+		end
 		headers:upsert(":scheme", scheme)
 	end
 	if uri_t.userinfo then
@@ -95,7 +100,7 @@ local function new_from_uri(uri_t, headers)
 	return setmetatable({
 		host = host;
 		port = port;
-		tls = (scheme == "https" or scheme == "wss");
+		tls = (scheme == "https");
 		headers = headers;
 		body = nil;
 	}, request_mt)
@@ -209,9 +214,9 @@ function request_methods:handle_redirect(orig_headers)
 		if not is_connect then
 			new_req.headers:upsert(":scheme", new_scheme)
 		end
-		if new_scheme == "https" or new_scheme == "wss" then
+		if new_scheme == "https" then
 			new_req.tls = true
-		elseif new_scheme == "http" or new_scheme == "ws" then
+		elseif new_scheme == "http" then
 			new_req.tls = false
 		else
 			return nil, "unknown scheme", ce.EINVAL

http/websocket.lua

@@ -545,8 +545,6 @@ end
 
 local function new_from_uri(uri, protocols)
 	local request = http_request.new_from_uri(uri)
-	local scheme = request.headers:get(":scheme")
-	assert(scheme == "ws" or scheme == "wss", "scheme not websocket")
 	local self = new("client")
 	self.request = request
 	self.request.version = 1.1

spec/websocket_spec.lua

@@ -375,6 +375,7 @@ describe("http.websocket module two sided tests", function()
 			port = 0;
 			onstream = function(s, stream)
 				local headers = assert(stream:get_headers())
+				assert.same("http", headers:get(":scheme"))
 				local ws = websocket.new_from_stream(stream, headers)
 				assert(ws:accept())
 				assert(ws:close())