http/h1_{connection,stream}: use 'target' instead of 'path' for request line

Author: daurnimator

doc/modules/http.h1_connection.md

@@ -113,7 +113,7 @@ Used to hand the reference of the connection socket to another object. Resets th
 
 ### `h1_connection:read_request_line(timeout)` <!-- --> {#http.h1_connection:read_request_line}
 
-Reads a request line from the socket. Returns the request method, requested path and HTTP version for an incoming request. `:read_request_line()` yields until a `"\r\n"` terminated chunk is received, or `timeout` is exceeded. If the incoming chunk is not a valid HTTP request line, `nil` is returned. On error, returns `nil`, an error message and an error number.
+Reads a request line from the socket. Returns the request method, request target and HTTP version for an incoming request. `:read_request_line()` yields until a `"\r\n"` terminated chunk is received, or `timeout` is exceeded. If the incoming chunk is not a valid HTTP request line, `nil` is returned. On error, returns `nil`, an error message and an error number.
 
 
 ### `h1_connection:read_status_line(timeout)` <!-- --> {#http.h1_connection:read_status_line}
@@ -146,7 +146,7 @@ Reads the entire request body. This function will yield until the body is comple
 Reads the next available line of data from the request and returns the chunk and any chunk extensions. This function will yield until chunk size is received or `timeout` is exceeded. If the chunk size is indicated as `0` then `false` and any chunk extensions are returned. Returns `nil`, an error message and an error number if there was an error reading reading the chunk header or the socket.
 
 
-### `h1_connection:write_request_line(method, path, httpversion, timeout)` <!-- --> {#http.h1_connection:write_request_line}
+### `h1_connection:write_request_line(method, target, httpversion, timeout)` <!-- --> {#http.h1_connection:write_request_line}
 
 Writes the opening HTTP 1.x request line for a new request to the socket buffer. Yields until success or `timeout`. If the write fails, returns `nil`, an error message and an error number.
 

http/h1_connection.lua

@@ -167,7 +167,7 @@ function connection_methods:read_request_line(timeout)
 		end
 		return nil, err, errno
 	end
-	local method, path, httpversion = line:match("^(%w+) (%S+) HTTP/(1%.[01])\r\n$")
+	local method, target, httpversion = line:match("^(%w+) (%S+) HTTP/(1%.[01])\r\n$")
 	if not method then
 		self.socket:seterror("r", ce.EILSEQ)
 		local ok, errno2 = self.socket:unget(line)
@@ -183,7 +183,7 @@ function connection_methods:read_request_line(timeout)
 		return nil, onerror(self.socket, "read_request_line", ce.EILSEQ)
 	end
 	httpversion = httpversion == "1.0" and 1.0 or 1.1 -- Avoid tonumber() due to locale issues
-	return method, path, httpversion
+	return method, target, httpversion
 end
 
 function connection_methods:read_status_line(timeout)
@@ -344,11 +344,11 @@ function connection_methods:read_body_chunk(timeout)
 	end
 end
 
-function connection_methods:write_request_line(method, path, httpversion, timeout)
+function connection_methods:write_request_line(method, target, httpversion, timeout)
 	assert(method:match("^[^ \r\n]+$"))
-	assert(path:match("^[^ \r\n]+$"))
+	assert(target:match("^[^ \r\n]+$"))
 	assert(httpversion == 1.0 or httpversion == 1.1)
-	local line = string.format("%s %s HTTP/%s\r\n", method, path, httpversion == 1.0 and "1.0" or "1.1")
+	local line = string.format("%s %s HTTP/%s\r\n", method, target, httpversion == 1.0 and "1.0" or "1.1")
 	local ok, err, errno = self.socket:xwrite(line, "f", timeout)
 	if not ok then
 		return nil, err, errno

http/h1_stream.lua

@@ -267,24 +267,24 @@ function stream_methods:read_headers(timeout)
 			if self.state == "half closed (local)" then
 				return nil
 			end
-			local method, path, httpversion = self.connection:read_request_line(0)
+			local method, target, httpversion = self.connection:read_request_line(0)
 			if method == nil then
 				if httpversion == ce.ETIMEDOUT then
 					timeout = deadline and deadline-monotime()
 					if cqueues.poll(self.connection.socket, timeout) ~= timeout then
 						return self:read_headers(deadline and deadline-monotime())
 					end
 				end
-				return nil, path, httpversion
+				return nil, target, httpversion
 			end
 			self.req_method = method
 			self.peer_version = httpversion
 			headers = new_headers()
 			headers:append(":method", method)
 			if method == "CONNECT" then
-				headers:append(":authority", path)
+				headers:append(":authority", target)
 			else
-				headers:append(":path", path)
+				headers:append(":path", target)
 			end
 			headers:append(":scheme", self:checktls() and "https" or "http")
 			self:set_state("open")
@@ -564,14 +564,14 @@ function stream_methods:write_headers(headers, end_stream, timeout)
 		if self.state == "idle" then
 			method = assert(headers:get(":method"), "missing method")
 			self.req_method = method
-			local path
+			local target
 			if method == "CONNECT" then
-				path = assert(headers:get(":authority"), "missing authority")
+				target = assert(headers:get(":authority"), "missing authority")
 				assert(not headers:has(":path"), "CONNECT requests should not have a path")
 			else
 				-- RFC 7230 Section 5.4: A client MUST send a Host header field in all HTTP/1.1 request messages.
 				assert(self.connection.version < 1.1 or headers:has(":authority"), "missing authority")
-				path = assert(headers:get(":path"), "missing path")
+				target = assert(headers:get(":path"), "missing path")
 			end
 			if self.connection.req_locked then
 				-- Wait until previous request has been fully written
@@ -585,7 +585,7 @@ function stream_methods:write_headers(headers, end_stream, timeout)
 			self.connection.pipeline:push(self)
 			self.connection.req_locked = self
 			-- write request line
-			local ok, err, errno = self.connection:write_request_line(method, path, self.connection.version, 0)
+			local ok, err, errno = self.connection:write_request_line(method, target, self.connection.version, 0)
 			if not ok then
 				return nil, err, errno
 			end