diff options
| author | zeripath <art27@cantab.net> | 2020-08-11 21:05:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 21:05:34 +0100 |
| commit | 74bd9691c685942798f2761607731697498ceeae (patch) | |
| tree | 531d661263b839ccf8aa6af73bfb6710984f0dd9 /modules/util/url.go | |
| parent | faa676cc8b4419ac56fbf9d009ea8c6b79834024 (diff) | |
| download | gitea-74bd9691c685942798f2761607731697498ceeae.tar.gz gitea-74bd9691c685942798f2761607731697498ceeae.zip | |
Re-attempt to delete temporary upload if the file is locked by another process (#12447)
Replace all calls to os.Remove/os.RemoveAll by retrying util.Remove/util.RemoveAll and remove circular dependencies from util.
Fix #12339
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'modules/util/url.go')
| -rw-r--r-- | modules/util/url.go | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/modules/util/url.go b/modules/util/url.go index 263255fcd3..96c66df92b 100644 --- a/modules/util/url.go +++ b/modules/util/url.go @@ -8,9 +8,6 @@ import ( "net/url" "path" "strings" - - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" ) // PathEscapeSegments escapes segments of a path while not escaping forward slash @@ -30,13 +27,11 @@ func URLJoin(base string, elems ...string) string { } baseURL, err := url.Parse(base) if err != nil { - log.Error("URLJoin: Invalid base URL %s", base) return "" } joinedPath := path.Join(elems...) argURL, err := url.Parse(joinedPath) if err != nil { - log.Error("URLJoin: Invalid arg %s", joinedPath) return "" } joinedURL := baseURL.ResolveReference(argURL).String() @@ -45,16 +40,3 @@ func URLJoin(base string, elems ...string) string { } return joinedURL } - -// IsExternalURL checks if rawURL points to an external URL like http://example.com -func IsExternalURL(rawURL string) bool { - parsed, err := url.Parse(rawURL) - if err != nil { - return true - } - appURL, _ := url.Parse(setting.AppURL) - if len(parsed.Host) != 0 && strings.Replace(parsed.Host, "www.", "", 1) != strings.Replace(appURL.Host, "www.", "", 1) { - return true - } - return false -} |