Merge branch 'master' of github.com:flc1125/gin into options

This commit is contained in:
Flc゛ 2024-03-14 14:28:43 +08:00
commit ee54f404e5
2 changed files with 8 additions and 0 deletions

View File

@ -15,6 +15,8 @@ import (
// AuthUserKey is the cookie name for user credential in basic auth. // AuthUserKey is the cookie name for user credential in basic auth.
const AuthUserKey = "user" const AuthUserKey = "user"
// AuthProxyUserKey is the cookie name for proxy_user credential in basic auth for proxy.
const AuthProxyUserKey = "proxy_user" const AuthProxyUserKey = "proxy_user"
// Accounts defines a key/value for user/pass list of authorized logins. // Accounts defines a key/value for user/pass list of authorized logins.
@ -92,6 +94,7 @@ func authorizationHeader(user, password string) string {
} }
// BasicAuthForProxy returns a Basic HTTP Proxy-Authorization middleware. // BasicAuthForProxy returns a Basic HTTP Proxy-Authorization middleware.
// If the realm is empty, "Proxy Authorization Required" will be used by default.
func BasicAuthForProxy(accounts Accounts, realm string) HandlerFunc { func BasicAuthForProxy(accounts Accounts, realm string) HandlerFunc {
if realm == "" { if realm == "" {
realm = "Proxy Authorization Required" realm = "Proxy Authorization Required"

View File

@ -6,6 +6,7 @@
package gin package gin
import ( import (
"runtime"
"strings" "strings"
"testing" "testing"
@ -80,6 +81,10 @@ func TestPathCleanMallocs(t *testing.T) {
t.Skip("skipping malloc count in short mode") t.Skip("skipping malloc count in short mode")
} }
if runtime.GOMAXPROCS(0) > 1 {
t.Skip("skipping malloc count; GOMAXPROCS>1")
}
for _, test := range cleanTests { for _, test := range cleanTests {
allocs := testing.AllocsPerRun(100, func() { cleanPath(test.result) }) allocs := testing.AllocsPerRun(100, func() { cleanPath(test.result) })
assert.EqualValues(t, allocs, 0) assert.EqualValues(t, allocs, 0)