simon987/od-database-crawler
1
0
Fork 0
mirror of https://github.com/terorie/od-database-crawler.git synced 2025-04-16 08:56:44 +00:00
Code Issues Projects Releases Wiki Activity

Remove URL.Opaque

Browse Source
This commit is contained in:
Richard Patel 2018-11-16 01:53:16 +01:00
parent f668365edb
commit ccaf758e90
No known key found for this signature in database
GPG Key ID: C268B2BBDA2ABECB
1 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
fasturl/url.go
View File

@ -326,7 +326,6 @@ func escape(s string, mode encoding) string {
// by calling the EscapedPath method.
type URL struct {
Scheme Scheme
Opaque string // encoded opaque data
Host string // host or host:port
Path string // path (relative paths may omit leading slash)
}
@ -446,7 +445,6 @@ func (u *URL) parse(rawurl string, viaRequest bool) error {
if !strings.HasPrefix(rest, "/") {
if u.Scheme != SchemeInvalid {
// We consider rootless paths per RFC 3986 as opaque.
u.Opaque = rest
return nil
}
if viaRequest {
@ -588,34 +586,30 @@ func (u *URL) String() string {
buf.WriteString(Schemes[u.Scheme])
buf.WriteByte(':')
}
if u.Opaque != "" {
buf.WriteString(u.Opaque)
} else {
if u.Scheme != SchemeInvalid || u.Host != "" {
if u.Host != "" || u.Path != "" {
buf.WriteString("//")
}
if h := u.Host; h != "" {
buf.WriteString(escape(h, encodeHost))
}
if u.Scheme != SchemeInvalid || u.Host != "" {
if u.Host != "" || u.Path != "" {
buf.WriteString("//")
}
path := u.Path
if path != "" && path[0] != '/' && u.Host != "" {
buf.WriteByte('/')
if h := u.Host; h != "" {
buf.WriteString(escape(h, encodeHost))
}
if buf.Len() == 0 {
// RFC 3986 §4.2
// A path segment that contains a colon character (e.g., "this:that")
// cannot be used as the first segment of a relative-path reference, as
// it would be mistaken for a scheme name. Such a segment must be
// preceded by a dot-segment (e.g., "./this:that") to make a relative-
// path reference.
if i := strings.IndexByte(path, ':'); i > -1 && strings.IndexByte(path[:i], '/') == -1 {
buf.WriteString("./")
}
}
buf.WriteString(path)
}
path := u.Path
if path != "" && path[0] != '/' && u.Host != "" {
buf.WriteByte('/')
}
if buf.Len() == 0 {
// RFC 3986 §4.2
// A path segment that contains a colon character (e.g., "this:that")
// cannot be used as the first segment of a relative-path reference, as
// it would be mistaken for a scheme name. Such a segment must be
// preceded by a dot-segment (e.g., "./this:that") to make a relative-
// path reference.
if i := strings.IndexByte(path, ':'); i > -1 && strings.IndexByte(path[:i], '/') == -1 {
buf.WriteString("./")
}
}
buf.WriteString(path)
return buf.String()
}
@ -694,11 +688,6 @@ func (u *URL) ResolveReference(url *URL, ref *URL) {
url.Path = resolvePath(ref.Path, "")
return
}
if ref.Opaque != "" {
url.Host = ""
url.Path = ""
return
}
// The "abs_path" or "rel_path" cases.
url.Host = u.Host
url.Path = resolvePath(u.Path, ref.Path)