Merge branch 'master' into update_gorp_path

maxim0r · Jan 25, 2015 · 6fcf6af · 6fcf6af
2 parents f4a4f79 + d538043
commit 6fcf6af
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/system/middleware.go b/system/middleware.go
@@ -113,11 +113,13 @@ func (application *Application) ApplyCsrfProtection(c *web.C, h http.Handler) ht
 		if c.Env["IsXhr"].(bool) {
 			if !isValidToken(csrfToken, r.Header.Get(csrfProtection.Header)) {
 				http.Error(w, "Invalid Csrf Header", http.StatusBadRequest)
+				return
 			}
 		} else {
 			if isCsrfProtectionMethodForNoXhr(r.Method) {
 				if !isValidToken(csrfToken, r.PostFormValue(csrfProtection.Key)) {
 					http.Error(w, "Invalid Csrf Token", http.StatusBadRequest)
+					return
 				}
 			}
 		}