gin-gonic · Feb 6, 2024 · Feb 6, 2024
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
diff --git a/.github/workflows/gin.yml b/.github/workflows/gin.yml
diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # Gin Web Framework
 
+## Frok and remove relation. Only relation std
+
 <img align="right" width="159px" src="https://raw.githubusercontent.com/gin-gonic/logo/master/color.png">
 
 [![Build Status](https://github.com/gin-gonic/gin/workflows/Run%20Tests/badge.svg?branch=master)](https://github.com/gin-gonic/gin/actions?query=branch%3Amaster)

diff --git a/auth_test.go b/auth_test.go
diff --git a/benchmarks_test.go b/benchmarks_test.go
diff --git a/binding/binding.go b/binding/binding.go
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a MIT style
 // license that can be found in the LICENSE file.
 
-//go:build !nomsgpack
-
 package binding
 
-import "net/http"
+import (
+	"net/http"
+)
 
 // Content-Type MIME of the most common data formats.
 const (
@@ -67,7 +67,7 @@ type StructValidator interface {
 // Validator is the default validator which implements the StructValidator
 // interface. It uses https://github.com/go-playground/validator/tree/v10.6.1
 // under the hood.
-var Validator StructValidator = &defaultValidator{}
+var Validator = true
 
 // These implement the Binding interface and can be used to bind the data
 // present in the request to struct instances.
@@ -78,12 +78,8 @@ var (
 	Query         = queryBinding{}
 	FormPost      = formPostBinding{}
 	FormMultipart = formMultipartBinding{}
-	ProtoBuf      = protobufBinding{}
-	MsgPack       = msgpackBinding{}
-	YAML          = yamlBinding{}
 	Uri           = uriBinding{}
 	Header        = headerBinding{}
-	TOML          = tomlBinding{}
 )
 
 // Default returns the appropriate Binding instance based on the HTTP method
@@ -98,24 +94,13 @@ func Default(method, contentType string) Binding {
 		return JSON
 	case MIMEXML, MIMEXML2:
 		return XML
-	case MIMEPROTOBUF:
-		return ProtoBuf
-	case MIMEMSGPACK, MIMEMSGPACK2:
-		return MsgPack
-	case MIMEYAML:
-		return YAML
-	case MIMETOML:
-		return TOML
 	case MIMEMultipartPOSTForm:
 		return FormMultipart
 	default: // case MIMEPOSTForm:
 		return Form
 	}
 }
 
-func validate(obj any) error {
-	if Validator == nil {
-		return nil
-	}
-	return Validator.ValidateStruct(obj)
+var Validate = func(v any) error {
+	return nil
 }
diff --git a/binding/binding_msgpack_test.go b/binding/binding_msgpack_test.go
diff --git a/binding/binding_nomsgpack.go b/binding/binding_nomsgpack.go
diff --git a/binding/binding_test.go b/binding/binding_test.go
diff --git a/binding/default_validator.go b/binding/default_validator.go
@@ -1,97 +1,97 @@
-// Copyright 2017 Manu Martinez-Almeida. All rights reserved.
-// Use of this source code is governed by a MIT style
-// license that can be found in the LICENSE file.
+// // Copyright 2017 Manu Martinez-Almeida. All rights reserved.
+// // Use of this source code is governed by a MIT style
+// // license that can be found in the LICENSE file.
 
 package binding
 
-import (
-	"fmt"
-	"reflect"
-	"strings"
-	"sync"
+// import (
+// 	"fmt"
+// 	"reflect"
+// 	"strings"
+// 	"sync"
 
-	"github.com/go-playground/validator/v10"
-)
+// 	"github.com/go-playground/validator/v10"
+// )
 
-type defaultValidator struct {
-	once     sync.Once
-	validate *validator.Validate
-}
+// type defaultValidator struct {
+// 	once     sync.Once
+// 	validate *validator.Validate
+// }
 
-type SliceValidationError []error
+// type SliceValidationError []error
 
-// Error concatenates all error elements in SliceValidationError into a single string separated by \n.
-func (err SliceValidationError) Error() string {
-	n := len(err)
-	switch n {
-	case 0:
-		return ""
-	default:
-		var b strings.Builder
-		if err[0] != nil {
-			fmt.Fprintf(&b, "[%d]: %s", 0, err[0].Error())
-		}
-		if n > 1 {
-			for i := 1; i < n; i++ {
-				if err[i] != nil {
-					b.WriteString("\n")
-					fmt.Fprintf(&b, "[%d]: %s", i, err[i].Error())
-				}
-			}
-		}
-		return b.String()
-	}
-}
+// // Error concatenates all error elements in SliceValidationError into a single string separated by \n.
+// func (err SliceValidationError) Error() string {
+// 	n := len(err)
+// 	switch n {
+// 	case 0:
+// 		return ""
+// 	default:
+// 		var b strings.Builder
+// 		if err[0] != nil {
+// 			fmt.Fprintf(&b, "[%d]: %s", 0, err[0].Error())
+// 		}
+// 		if n > 1 {
+// 			for i := 1; i < n; i++ {
+// 				if err[i] != nil {
+// 					b.WriteString("\n")
+// 					fmt.Fprintf(&b, "[%d]: %s", i, err[i].Error())
+// 				}
+// 			}
+// 		}
+// 		return b.String()
+// 	}
+// }
 
-var _ StructValidator = (*defaultValidator)(nil)
+// var _ StructValidator = (*defaultValidator)(nil)
 
-// ValidateStruct receives any kind of type, but only performed struct or pointer to struct type.
-func (v *defaultValidator) ValidateStruct(obj any) error {
-	if obj == nil {
-		return nil
-	}
+// // ValidateStruct receives any kind of type, but only performed struct or pointer to struct type.
+// func (v *defaultValidator) ValidateStruct(obj any) error {
+// 	if obj == nil {
+// 		return nil
+// 	}
 
-	value := reflect.ValueOf(obj)
-	switch value.Kind() {
-	case reflect.Ptr:
-		return v.ValidateStruct(value.Elem().Interface())
-	case reflect.Struct:
-		return v.validateStruct(obj)
-	case reflect.Slice, reflect.Array:
-		count := value.Len()
-		validateRet := make(SliceValidationError, 0)
-		for i := 0; i < count; i++ {
-			if err := v.ValidateStruct(value.Index(i).Interface()); err != nil {
-				validateRet = append(validateRet, err)
-			}
-		}
-		if len(validateRet) == 0 {
-			return nil
-		}
-		return validateRet
-	default:
-		return nil
-	}
-}
+// 	value := reflect.ValueOf(obj)
+// 	switch value.Kind() {
+// 	case reflect.Ptr:
+// 		return v.ValidateStruct(value.Elem().Interface())
+// 	case reflect.Struct:
+// 		return v.validateStruct(obj)
+// 	case reflect.Slice, reflect.Array:
+// 		count := value.Len()
+// 		validateRet := make(SliceValidationError, 0)
+// 		for i := 0; i < count; i++ {
+// 			if err := v.ValidateStruct(value.Index(i).Interface()); err != nil {
+// 				validateRet = append(validateRet, err)
+// 			}
+// 		}
+// 		if len(validateRet) == 0 {
+// 			return nil
+// 		}
+// 		return validateRet
+// 	default:
+// 		return nil
+// 	}
+// }
 
-// validateStruct receives struct type
-func (v *defaultValidator) validateStruct(obj any) error {
-	v.lazyinit()
-	return v.validate.Struct(obj)
-}
+// // validateStruct receives struct type
+// func (v *defaultValidator) validateStruct(obj any) error {
+// 	v.lazyinit()
+// 	return v.validate.Struct(obj)
+// }
 
-// Engine returns the underlying validator engine which powers the default
-// Validator instance. This is useful if you want to register custom validations
-// or struct level validations. See validator GoDoc for more info -
-// https://pkg.go.dev/github.com/go-playground/validator/v10
-func (v *defaultValidator) Engine() any {
-	v.lazyinit()
-	return v.validate
-}
+// // Engine returns the underlying validator engine which powers the default
+// // Validator instance. This is useful if you want to register custom validations
+// // or struct level validations. See validator GoDoc for more info -
+// // https://pkg.go.dev/github.com/go-playground/validator/v10
+// func (v *defaultValidator) Engine() any {
+// 	v.lazyinit()
+// 	return v.validate
+// }
 
-func (v *defaultValidator) lazyinit() {
-	v.once.Do(func() {
-		v.validate = validator.New()
-		v.validate.SetTagName("binding")
-	})
-}
+// func (v *defaultValidator) lazyinit() {
+// 	v.once.Do(func() {
+// 		v.validate = validator.New()
+// 		v.validate.SetTagName("binding")
+// 	})
+// }
diff --git a/binding/default_validator_benchmark_test.go b/binding/default_validator_benchmark_test.go
diff --git a/binding/default_validator_test.go b/binding/default_validator_test.go
diff --git a/binding/form.go b/binding/form.go
@@ -29,7 +29,7 @@ func (formBinding) Bind(req *http.Request, obj any) error {
 	if err := mapForm(obj, req.Form); err != nil {
 		return err
 	}
-	return validate(obj)
+	return Validate(obj)
 }
 
 func (formPostBinding) Name() string {
@@ -43,7 +43,7 @@ func (formPostBinding) Bind(req *http.Request, obj any) error {
 	if err := mapForm(obj, req.PostForm); err != nil {
 		return err
 	}
-	return validate(obj)
+	return Validate(obj)
 }
 
 func (formMultipartBinding) Name() string {
@@ -58,5 +58,5 @@ func (formMultipartBinding) Bind(req *http.Request, obj any) error {
 		return err
 	}
 
-	return validate(obj)
+	return Validate(obj)
 }
diff --git a/binding/form_mapping_benchmark_test.go b/binding/form_mapping_benchmark_test.go
diff --git a/binding/form_mapping_test.go b/binding/form_mapping_test.go
diff --git a/binding/header.go b/binding/header.go
@@ -22,7 +22,7 @@ func (headerBinding) Bind(req *http.Request, obj any) error {
 		return err
 	}
 
-	return validate(obj)
+	return Validate(obj)
 }
 
 func mapHeader(ptr any, h map[string][]string) error {

diff --git a/binding/json.go b/binding/json.go
@@ -52,5 +52,5 @@ func decodeJSON(r io.Reader, obj any) error {
 	if err := decoder.Decode(obj); err != nil {
 		return err
 	}
-	return validate(obj)
+	return Validate(obj)
 }
diff --git a/binding/json_test.go b/binding/json_test.go
diff --git a/binding/msgpack.go b/binding/msgpack.go
diff --git a/binding/msgpack_test.go b/binding/msgpack_test.go
diff --git a/binding/multipart_form_mapping_test.go b/binding/multipart_form_mapping_test.go
diff --git a/binding/protobuf.go b/binding/protobuf.go
diff --git a/binding/query.go b/binding/query.go
@@ -17,5 +17,5 @@ func (queryBinding) Bind(req *http.Request, obj any) error {
 	if err := mapForm(obj, values); err != nil {
 		return err
 	}
-	return validate(obj)
+	return Validate(obj)
 }
diff --git a/binding/toml.go b/binding/toml.go
diff --git a/binding/toml_test.go b/binding/toml_test.go
diff --git a/binding/uri.go b/binding/uri.go
@@ -14,5 +14,5 @@ func (uriBinding) BindUri(m map[string][]string, obj any) error {
 	if err := mapURI(obj, m); err != nil {
 		return err
 	}
-	return validate(obj)
+	return Validate(obj)
 }
diff --git a/binding/validate_test.go b/binding/validate_test.go
diff --git a/binding/xml.go b/binding/xml.go
@@ -29,5 +29,5 @@ func decodeXML(r io.Reader, obj any) error {
 	if err := decoder.Decode(obj); err != nil {
 		return err
 	}
-	return validate(obj)
+	return Validate(obj)
 }
diff --git a/binding/xml_test.go b/binding/xml_test.go
diff --git a/binding/yaml.go b/binding/yaml.go
diff --git a/binding/yaml_test.go b/binding/yaml_test.go
diff --git a/context.go b/context.go
@@ -19,7 +19,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gin-contrib/sse"
 	"github.com/gin-gonic/gin/binding"
 	"github.com/gin-gonic/gin/render"
 )
@@ -646,16 +645,6 @@ func (c *Context) BindQuery(obj any) error {
 	return c.MustBindWith(obj, binding.Query)
 }
 
-// BindYAML is a shortcut for c.MustBindWith(obj, binding.YAML).
-func (c *Context) BindYAML(obj any) error {
-	return c.MustBindWith(obj, binding.YAML)
-}
-
-// BindTOML is a shortcut for c.MustBindWith(obj, binding.TOML).
-func (c *Context) BindTOML(obj any) error {
-	return c.MustBindWith(obj, binding.TOML)
-}
-
 // BindHeader is a shortcut for c.MustBindWith(obj, binding.Header).
 func (c *Context) BindHeader(obj any) error {
 	return c.MustBindWith(obj, binding.Header)
@@ -711,16 +700,6 @@ func (c *Context) ShouldBindQuery(obj any) error {
 	return c.ShouldBindWith(obj, binding.Query)
 }
 
-// ShouldBindYAML is a shortcut for c.ShouldBindWith(obj, binding.YAML).
-func (c *Context) ShouldBindYAML(obj any) error {
-	return c.ShouldBindWith(obj, binding.YAML)
-}
-
-// ShouldBindTOML is a shortcut for c.ShouldBindWith(obj, binding.TOML).
-func (c *Context) ShouldBindTOML(obj any) error {
-	return c.ShouldBindWith(obj, binding.TOML)
-}
-
 // ShouldBindHeader is a shortcut for c.ShouldBindWith(obj, binding.Header).
 func (c *Context) ShouldBindHeader(obj any) error {
 	return c.ShouldBindWith(obj, binding.Header)
@@ -866,6 +845,17 @@ func (c *Context) Header(key, value string) {
 	c.Writer.Header().Set(key, value)
 }
 
+// GetHeader returns value from request headers.
+func (s *Context) GetIP() (ip string) {
+	if ip = s.GetHeader("X-Real-IP"); ip != "" {
+		return
+	}
+	if ip = s.GetHeader("x-forwarded-for"); ip != "" {
+		return
+	}
+	return s.Request.RemoteAddr
+}
+
 // GetHeader returns value from request headers.
 func (c *Context) GetHeader(key string) string {
 	return c.requestHeader(key)
@@ -989,21 +979,6 @@ func (c *Context) XML(code int, obj any) {
 	c.Render(code, render.XML{Data: obj})
 }
 
-// YAML serializes the given struct as YAML into the response body.
-func (c *Context) YAML(code int, obj any) {
-	c.Render(code, render.YAML{Data: obj})
-}
-
-// TOML serializes the given struct as TOML into the response body.
-func (c *Context) TOML(code int, obj any) {
-	c.Render(code, render.TOML{Data: obj})
-}
-
-// ProtoBuf serializes the given struct as ProtoBuf into the response body.
-func (c *Context) ProtoBuf(code int, obj any) {
-	c.Render(code, render.ProtoBuf{Data: obj})
-}
-
 // String writes the given string into the response body.
 func (c *Context) String(code int, format string, values ...any) {
 	c.Render(code, render.String{Format: format, Data: values})
@@ -1069,14 +1044,6 @@ func (c *Context) FileAttachment(filepath, filename string) {
 	http.ServeFile(c.Writer, c.Request, filepath)
 }
 
-// SSEvent writes a Server-Sent Event into the body stream.
-func (c *Context) SSEvent(name string, message any) {
-	c.Render(-1, sse.Event{
-		Event: name,
-		Data:  message,
-	})
-}
-
 // Stream sends a streaming response and returns a boolean
 // indicates "Is client disconnected in middle of stream"
 func (c *Context) Stream(step func(w io.Writer) bool) bool {
@@ -1127,14 +1094,6 @@ func (c *Context) Negotiate(code int, config Negotiate) {
 		data := chooseData(config.XMLData, config.Data)
 		c.XML(code, data)
 
-	case binding.MIMEYAML:
-		data := chooseData(config.YAMLData, config.Data)
-		c.YAML(code, data)
-
-	case binding.MIMETOML:
-		data := chooseData(config.TOMLData, config.Data)
-		c.TOML(code, data)
-
 	default:
 		c.AbortWithError(http.StatusNotAcceptable, errors.New("the accepted formats are not offered by the server")) //nolint: errcheck
 	}

diff --git a/context_1.18_test.go b/context_1.18_test.go
diff --git a/context_1.19_test.go b/context_1.19_test.go
diff --git a/context_appengine.go b/context_appengine.go
diff --git a/context_test.go b/context_test.go
diff --git a/debug_test.go b/debug_test.go
diff --git a/deprecated_test.go b/deprecated_test.go
diff --git a/errors_test.go b/errors_test.go
diff --git a/gin.go b/gin.go
@@ -17,8 +17,6 @@ import (
 
 	"github.com/gin-gonic/gin/internal/bytesconv"
 	"github.com/gin-gonic/gin/render"
-	"golang.org/x/net/http2"
-	"golang.org/x/net/http2/h2c"
 )
 
 const defaultMultipartMemory = 32 << 20 // 32 MB
@@ -221,12 +219,7 @@ func Default() *Engine {
 }
 
 func (engine *Engine) Handler() http.Handler {
-	if !engine.UseH2C {
-		return engine
-	}
-
-	h2s := &http2.Server{}
-	return h2c.NewHandler(engine, h2s)
+	return engine
 }
 
 func (engine *Engine) allocateContext(maxParams uint16) *Context {

diff --git a/ginS/README.md b/ginS/README.md
diff --git a/ginS/gins.go b/ginS/gins.go
diff --git a/gin_integration_test.go b/gin_integration_test.go
diff --git a/gin_test.go b/gin_test.go
diff --git a/githubapi_test.go b/githubapi_test.go
diff --git a/go.mod b/go.mod
@@ -1,37 +1,3 @@
 module github.com/gin-gonic/gin
 
 go 1.20
-
-require (
-	github.com/bytedance/sonic v1.10.2
-	github.com/gin-contrib/sse v0.1.0
-	github.com/go-playground/validator/v10 v10.17.0
-	github.com/goccy/go-json v0.10.2
-	github.com/json-iterator/go v1.1.12
-	github.com/mattn/go-isatty v0.0.20
-	github.com/pelletier/go-toml/v2 v2.1.1
-	github.com/stretchr/testify v1.8.4
-	github.com/ugorji/go/codec v1.2.12
-	golang.org/x/net v0.20.0
-	google.golang.org/protobuf v1.32.0
-	gopkg.in/yaml.v3 v3.0.1
-)
-
-require (
-	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
-	github.com/chenzhuoyu/iasm v0.9.1 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
-	github.com/go-playground/locales v0.14.1 // indirect
-	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
-	github.com/leodido/go-urn v1.3.0 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	golang.org/x/arch v0.7.0 // indirect
-	golang.org/x/crypto v0.18.0 // indirect
-	golang.org/x/sys v0.16.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-)
diff --git a/go.sum b/go.sum
diff --git a/internal/json/go_json.go b/internal/json/go_json.go
diff --git a/internal/json/json.go b/internal/json/json.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a MIT style
 // license that can be found in the LICENSE file.
 
-//go:build !jsoniter && !go_json && !(sonic && avx && (linux || windows || darwin) && amd64)
-
 package json
 
 import "encoding/json"

diff --git a/internal/json/jsoniter.go b/internal/json/jsoniter.go
diff --git a/internal/json/sonic.go b/internal/json/sonic.go
diff --git a/logger.go b/logger.go
@@ -10,8 +10,6 @@ import (
 	"net/http"
 	"os"
 	"time"
-
-	"github.com/mattn/go-isatty"
 )
 
 type consoleColorModeValue int
@@ -224,8 +222,7 @@ func LoggerWithConfig(conf LoggerConfig) HandlerFunc {
 
 	isTerm := true
 
-	if w, ok := out.(*os.File); !ok || os.Getenv("TERM") == "dumb" ||
-		(!isatty.IsTerminal(w.Fd()) && !isatty.IsCygwinTerminal(w.Fd())) {
+	if os.Getenv("TERM") == "dumb" {
 		isTerm = false
 	}