From: Joe Kyo Date: Tue, 31 Oct 2017 09:47:27 +0000 (+0000) Subject: net/http: display connect methods table properly in `go doc` X-Git-Tag: go1.10beta1~510 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5536180ae72e8745c8a831e03f56a86360d76c52;p=gostls13.git net/http: display connect methods table properly in `go doc` When run `go doc -u http.connectMethod`, the whole table is treated as a single long line. This commit inserts `\t` at the begining of each line, so the table can be displayed properly in `go doc`. Change-Id: I6408efd31f84c113e81167d62e1791643000d629 Reviewed-on: https://go-review.googlesource.com/74651 Reviewed-by: Ian Lance Taylor --- diff --git a/src/net/http/transport.go b/src/net/http/transport.go index d08504d7ab..45e3fd2eba 100644 --- a/src/net/http/transport.go +++ b/src/net/http/transport.go @@ -1303,16 +1303,16 @@ func useProxy(addr string) bool { // // A connect method may be of the following types: // -// Cache key form Description -// ----------------- ------------------------- -// |http|foo.com http directly to server, no proxy -// |https|foo.com https directly to server, no proxy -// http://proxy.com|https|foo.com http to proxy, then CONNECT to foo.com -// http://proxy.com|http http to proxy, http to anywhere after that -// socks5://proxy.com|http|foo.com socks5 to proxy, then http to foo.com -// socks5://proxy.com|https|foo.com socks5 to proxy, then https to foo.com -// https://proxy.com|https|foo.com https to proxy, then CONNECT to foo.com -// https://proxy.com|http https to proxy, http to anywhere after that +// Cache key form Description +// ----------------- ------------------------- +// |http|foo.com http directly to server, no proxy +// |https|foo.com https directly to server, no proxy +// http://proxy.com|https|foo.com http to proxy, then CONNECT to foo.com +// http://proxy.com|http http to proxy, http to anywhere after that +// socks5://proxy.com|http|foo.com socks5 to proxy, then http to foo.com +// socks5://proxy.com|https|foo.com socks5 to proxy, then https to foo.com +// https://proxy.com|https|foo.com https to proxy, then CONNECT to foo.com +// https://proxy.com|http https to proxy, http to anywhere after that // type connectMethod struct { proxyURL *url.URL // nil for no proxy, else full proxy URL