Merge pull request #19 from WnP/master

buaazp · web-flow · commit ade4e2031af3 · 2016-12-15T20:12:41.000+08:00
[fix] BasicAuth header and return
diff --git a/examples/auth/README.md b/examples/auth/README.md
@@ -58,10 +58,11 @@ func BasicAuth(h fasthttp.RequestHandler, requiredUser, requiredPassword string)
 		if hasAuth && user == requiredUser && password == requiredPassword {
 			// Delegate request to the given handle
 			h(ctx)
+			return
 		}
 		// Request Basic Authentication otherwise
-		ctx.Response.Header.Set("WWW-Authenticate", "Basic realm=Restricted")
 		ctx.Error(fasthttp.StatusMessage(fasthttp.StatusUnauthorized), fasthttp.StatusUnauthorized)
+		ctx.Response.Header.Set("WWW-Authenticate", "Basic realm=Restricted")
 	})
 }
 
diff --git a/examples/auth/auth.go b/examples/auth/auth.go
@@ -49,10 +49,11 @@ func BasicAuth(h fasthttp.RequestHandler, requiredUser, requiredPassword string)
 		if hasAuth && user == requiredUser && password == requiredPassword {
 			// Delegate request to the given handle
 			h(ctx)
+			return
 		}
 		// Request Basic Authentication otherwise
-		ctx.Response.Header.Set("WWW-Authenticate", "Basic realm=Restricted")
 		ctx.Error(fasthttp.StatusMessage(fasthttp.StatusUnauthorized), fasthttp.StatusUnauthorized)
+		ctx.Response.Header.Set("WWW-Authenticate", "Basic realm=Restricted")
 	})
 }
 

Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,11 @@ func BasicAuth(h fasthttp.RequestHandler, requiredUser, requiredPassword string)`
`58`	`58`	`if hasAuth && user == requiredUser && password == requiredPassword {`
`59`	`59`	`// Delegate request to the given handle`
`60`	`60`	`h(ctx)`
	`61`	`+ return`
`61`	`62`	`}`
`62`	`63`	`// Request Basic Authentication otherwise`
`63`		`- ctx.Response.Header.Set("WWW-Authenticate", "Basic realm=Restricted")`
`64`	`64`	`ctx.Error(fasthttp.StatusMessage(fasthttp.StatusUnauthorized), fasthttp.StatusUnauthorized)`
	`65`	`+ ctx.Response.Header.Set("WWW-Authenticate", "Basic realm=Restricted")`
`65`	`66`	`})`
`66`	`67`	`}`
`67`	`68`
Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,11 @@ func BasicAuth(h fasthttp.RequestHandler, requiredUser, requiredPassword string)`
`49`	`49`	`if hasAuth && user == requiredUser && password == requiredPassword {`
`50`	`50`	`// Delegate request to the given handle`
`51`	`51`	`h(ctx)`
	`52`	`+ return`
`52`	`53`	`}`
`53`	`54`	`// Request Basic Authentication otherwise`
`54`		`- ctx.Response.Header.Set("WWW-Authenticate", "Basic realm=Restricted")`
`55`	`55`	`ctx.Error(fasthttp.StatusMessage(fasthttp.StatusUnauthorized), fasthttp.StatusUnauthorized)`
	`56`	`+ ctx.Response.Header.Set("WWW-Authenticate", "Basic realm=Restricted")`
`56`	`57`	`})`
`57`	`58`	`}`
`58`	`59`