CERBERUS/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2026-06-30 05:42:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
caddyhttp/httpserver/plugin.go
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)

1
caddyhttp/httpserver/plugin_test.go
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)