diff --git a/vlib/net/http/http_proxy.v b/vlib/net/http/http_proxy.v index 7e420c62f5..f175d64414 100644 --- a/vlib/net/http/http_proxy.v +++ b/vlib/net/http/http_proxy.v @@ -87,9 +87,7 @@ fn (pr &HttpProxy) build_proxy_headers(host string) string { fn (pr &HttpProxy) http_do(host urllib.URL, method Method, path string, req &Request) !Response { host_name, port := net.split_address(host.hostname())! - port_part := if port == 80 || port == 0 { '' } else { ':${port}' } - - s := req.build_request_headers(req.method, host_name, port, '${host.scheme}://${host_name}${port_part}${path}') + s := req.build_request_headers(req.method, host_name, port, path) if host.scheme == 'https' { mut client := pr.ssl_dial('${host.host}:443')! diff --git a/vlib/net/http/http_proxy_test.v b/vlib/net/http/http_proxy_test.v index af47bf3b82..01660f16af 100644 --- a/vlib/net/http/http_proxy_test.v +++ b/vlib/net/http/http_proxy_test.v @@ -1,8 +1,6 @@ module http import encoding.base64 -import net.urllib -import os const sample_proxy_url = 'https://localhost' const sample_auth_proxy_url = 'http://user:pass@localhost:8888' @@ -48,29 +46,3 @@ fn test_proxy_headers_authenticated() ? { assert headers == 'CONNECT 127.0.0.1:1337 HTTP/1.1\r\n' + 'Host: 127.0.0.1\r\n' + 'Proxy-Connection: Keep-Alive\r\nProxy-Authorization: Basic ${auth_token}\r\n\r\n' } - -fn test_http_proxy_do() { - env := os.environ() - mut env_proxy := '' - - for envvar in ['http_proxy', 'HTTP_PROXY', 'https_proxy', 'HTTPS_PROXY'] { - prox_val := env[envvar] or { continue } - if prox_val != '' { - env_proxy = env[envvar] - } - } - if env_proxy != '' { - println('Has usable proxy env vars') - proxy := new_http_proxy(env_proxy)! - mut header := new_header(key: .user_agent, value: 'vlib') - header.add_custom('X-Vlang-Test', 'proxied')! - res := proxy.http_do(urllib.parse('http://httpbin.org/headers')!, Method.get, - '/headers', &Request{ proxy: proxy, header: header })! - println(res.status_code) - println('he4aders ${res.header}') - assert res.status_code == 200 - // assert res.header.data['X-Vlang-Test'] == 'proxied' - } else { - println('Proxy env vars (HTTP_PROXY or HTTPS_PROXY) not set. Skipping test.') - } -} diff --git a/vlib/time/operator.v b/vlib/time/operator.v index 66dcdb0bd4..8242e3444e 100644 --- a/vlib/time/operator.v +++ b/vlib/time/operator.v @@ -3,8 +3,8 @@ module time // operator `==` returns true if provided time is equal to time @[inline] pub fn (t1 Time) == (t2 Time) bool { - return t1.nanosecond == t2.nanosecond && t1.is_local == t2.is_local - && t1.local_unix() == t2.local_unix() + return t1.is_local == t2.is_local && t1.local_unix() == t2.local_unix() + && t1.nanosecond == t2.nanosecond } // operator `<` returns true if provided time is less than time