|
|
|
@ -34,12 +34,15 @@ func clientURLAbsolute(base *url.URL, relative string) (*url.URL, error) { |
|
|
|
return nil, err |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if !u.IsAbs() { |
|
|
|
if strings.HasPrefix(relative, "//") { |
|
|
|
|
|
|
|
u.Scheme = base.Scheme |
|
|
|
|
|
|
|
} else if !u.IsAbs() { |
|
|
|
u = &url.URL{ |
|
|
|
u = &url.URL{ |
|
|
|
Scheme: base.Scheme, |
|
|
|
Scheme: base.Scheme, |
|
|
|
User: base.User, |
|
|
|
User: base.User, |
|
|
|
Host: base.Host, |
|
|
|
Host: base.Host, |
|
|
|
Path: gopath.Join(gopath.Dir(base.Path), relative), |
|
|
|
Path: gopath.Join(gopath.Dir(base.Path), u.Path), |
|
|
|
|
|
|
|
RawQuery: u.RawQuery, |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|