mirror of
https://github.com/vlang/v.git
synced 2023-08-10 21:13:21 +03:00
fmt: remove space in front of ? and ! (#14366)
This commit is contained in:
@@ -62,7 +62,7 @@ pub fn (req &Request) do() ?Response {
|
||||
if no_redirects == max_redirects {
|
||||
return error('http.request.do: maximum number of redirects reached ($max_redirects)')
|
||||
}
|
||||
qresp := req.method_and_url_to_response(req.method, rurl) ?
|
||||
qresp := req.method_and_url_to_response(req.method, rurl)?
|
||||
resp = qresp
|
||||
if !req.allow_redirect {
|
||||
break
|
||||
@@ -105,11 +105,11 @@ fn (req &Request) method_and_url_to_response(method Method, url urllib.URL) ?Res
|
||||
// println('fetch $method, $scheme, $host_name, $nport, $path ')
|
||||
if scheme == 'https' {
|
||||
// println('ssl_do( $nport, $method, $host_name, $path )')
|
||||
res := req.ssl_do(nport, method, host_name, path) ?
|
||||
res := req.ssl_do(nport, method, host_name, path)?
|
||||
return res
|
||||
} else if scheme == 'http' {
|
||||
// println('http_do( $nport, $method, $host_name, $path )')
|
||||
res := req.http_do('$host_name:$nport', method, path) ?
|
||||
res := req.http_do('$host_name:$nport', method, path)?
|
||||
return res
|
||||
}
|
||||
return error('http.request.method_and_url_to_response: unsupported scheme: "$scheme"')
|
||||
@@ -152,18 +152,18 @@ fn (req &Request) build_request_cookies_header() string {
|
||||
}
|
||||
|
||||
fn (req &Request) http_do(host string, method Method, path string) ?Response {
|
||||
host_name, _ := net.split_address(host) ?
|
||||
host_name, _ := net.split_address(host)?
|
||||
s := req.build_request_headers(method, host_name, path)
|
||||
mut client := net.dial_tcp(host) ?
|
||||
mut client := net.dial_tcp(host)?
|
||||
client.set_read_timeout(req.read_timeout)
|
||||
client.set_write_timeout(req.write_timeout)
|
||||
// TODO this really needs to be exposed somehow
|
||||
client.write(s.bytes()) ?
|
||||
client.write(s.bytes())?
|
||||
$if trace_http_request ? {
|
||||
eprintln('> $s')
|
||||
}
|
||||
mut bytes := io.read_all(reader: client) ?
|
||||
client.close() ?
|
||||
mut bytes := io.read_all(reader: client)?
|
||||
client.close()?
|
||||
response_text := bytes.bytestr()
|
||||
$if trace_http_response ? {
|
||||
eprintln('< $response_text')
|
||||
@@ -179,7 +179,7 @@ pub fn (req &Request) referer() string {
|
||||
// parse_request parses a raw HTTP request into a Request object.
|
||||
// See also: `parse_request_head`, which parses only the headers.
|
||||
pub fn parse_request(mut reader io.BufferedReader) ?Request {
|
||||
mut request := parse_request_head(mut reader) ?
|
||||
mut request := parse_request_head(mut reader)?
|
||||
|
||||
// body
|
||||
mut body := []u8{}
|
||||
@@ -201,16 +201,16 @@ pub fn parse_request(mut reader io.BufferedReader) ?Request {
|
||||
// parse_request_head parses *only* the header of a raw HTTP request into a Request object
|
||||
pub fn parse_request_head(mut reader io.BufferedReader) ?Request {
|
||||
// request line
|
||||
mut line := reader.read_line() ?
|
||||
method, target, version := parse_request_line(line) ?
|
||||
mut line := reader.read_line()?
|
||||
method, target, version := parse_request_line(line)?
|
||||
|
||||
// headers
|
||||
mut header := new_header()
|
||||
line = reader.read_line() ?
|
||||
line = reader.read_line()?
|
||||
for line != '' {
|
||||
key, value := parse_header(line) ?
|
||||
header.add_custom(key, value) ?
|
||||
line = reader.read_line() ?
|
||||
key, value := parse_header(line)?
|
||||
header.add_custom(key, value)?
|
||||
line = reader.read_line()?
|
||||
}
|
||||
header.coerce(canonicalize: true)
|
||||
|
||||
@@ -228,7 +228,7 @@ fn parse_request_line(s string) ?(Method, urllib.URL, Version) {
|
||||
return error('malformed request line')
|
||||
}
|
||||
method := method_from_str(words[0])
|
||||
target := urllib.parse(words[1]) ?
|
||||
target := urllib.parse(words[1])?
|
||||
version := version_from_str(words[2])
|
||||
if version == .unknown {
|
||||
return error('unsupported version')
|
||||
|
||||
Reference in New Issue
Block a user