coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#2334 strip whitespace for migrate URL 

Also fix a possible race condition while install
This commit is contained in:
Unknwon 2016-02-20 17:32:34 -05:00
parent d5a3021a7d
commit 926e75d721
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/auth/repo_form.go
View File

@ -57,7 +57,7 @@ func (f *MigrateRepoForm) Validate(ctx *macaron.Context, errs binding.Errors) bi
// It also checks if given user has permission when remote address // It also checks if given user has permission when remote address
// is actually a local path. // is actually a local path.
func (f MigrateRepoForm) ParseRemoteAddr(user *models.User) (string, error) { func (f MigrateRepoForm) ParseRemoteAddr(user *models.User) (string, error) {
remoteAddr := f.CloneAddr remoteAddr := strings.TrimSpace(f.CloneAddr)
// Remote address can be HTTP/HTTPS/Git URL or local path. // Remote address can be HTTP/HTTPS/Git URL or local path.
if strings.HasPrefix(remoteAddr, "http://") || if strings.HasPrefix(remoteAddr, "http://") ||

5
modules/mailer/mailer.go
View File

@ -197,7 +197,10 @@ func processMailQueue() {
var mailQueue chan *Message var mailQueue chan *Message
func NewContext() { func NewContext() {
if setting.MailService == nil { // Need to check if mailQueue is nil because in during reinstall (user had installed
// before but swithed install lock off), this function will be called again
// while mail queue is already processing tasks, and produces a race condition.
if setting.MailService == nil || mailQueue != nil {
return return
} }