Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00
Code Issues Activity

templates: Another context fix when host header is missing port

Browse source
This commit is contained in:
Matthew Holt 2015-11-17 14:35:18 -07:00
parent a2ba00bdc8
commit b9244cdf2e
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
middleware/context.go
View file

@ -110,6 +110,10 @@ func (c Context) Host() (string, error) {
func (c Context) Port() (string, error) { func (c Context) Port() (string, error) {
_, port, err := net.SplitHostPort(c.Req.Host) _, port, err := net.SplitHostPort(c.Req.Host)
if err != nil { if err != nil {
if !strings.Contains(c.Req.Host, ":") {
// common with sites served on the default port 80
return "80", nil
}
return "", err return "", err
} }
return port, nil return port, nil

9
middleware/context_test.go
View file

@ -260,14 +260,19 @@ func TestPort(t *testing.T) {
}, },
{ {
input: "localhost", input: "localhost",
expectedPort: "", expectedPort: "80", // assuming 80 is the default port
shouldErr: true, // missing port in address shouldErr: false,
}, },
{ {
input: ":8080", input: ":8080",
expectedPort: "8080", expectedPort: "8080",
shouldErr: false, shouldErr: false,
}, },
{
input: "[::]",
expectedPort: "",
shouldErr: true,
},
} }
for _, test := range tests { for _, test := range tests {