Properly handle path-only addresses (also fix godoc typos)

This commit is contained in:
Matthew Holt 2016-07-18 18:45:20 -06:00
parent 4ff46ad447
commit df018ea64a
No known key found for this signature in database
GPG key ID: 0D97CC73664F4D03
3 changed files with 5 additions and 4 deletions

View file

@ -236,7 +236,7 @@ func listenerAddrEqual(ln net.Listener, addr string) bool {
}
// TCPServer is a type that can listen and serve connections.
// A TCPServer must associate with exactly or one net.Listeners.
// A TCPServer must associate with exactly zero or one net.Listeners.
type TCPServer interface {
// Listen starts listening by creating a new listener
// and returning it. It does not start accepting
@ -254,7 +254,7 @@ type TCPServer interface {
}
// UDPServer is a type that can listen and serve packets.
// A UDPServer must associate with exactly or one net.PacketConns.
// A UDPServer must associate with exactly zero or one net.PacketConns.
type UDPServer interface {
// ListenPacket starts listening by creating a new packetconn
// and returning it. It does not start accepting connections.

View file

@ -273,12 +273,12 @@ func (a Address) VHost() string {
}
// standardizeAddress parses an address string into a structured format with separate
// scheme, host, and port portions, as well as the original input string.
// scheme, host, port, and path portions, as well as the original input string.
func standardizeAddress(str string) (Address, error) {
input := str
// Split input into components (prepend with // to assert host by default)
if !strings.Contains(str, "//") {
if !strings.Contains(str, "//") && !strings.HasPrefix(str, "/") {
str = "//" + str
}
u, err := url.Parse(str)

View file

@ -50,6 +50,7 @@ func TestStandardizeAddress(t *testing.T) {
{`https://host:443/path/foo`, "https", "host", "443", "/path/foo", false},
{`host:80/path`, "", "host", "80", "/path", false},
{`host:https/path`, "https", "host", "443", "/path", false},
{`/path`, "", "", "", "/path", false},
} {
actual, err := standardizeAddress(test.input)