Bump golang.org/x/net from 0.38.0 to 0.46.0
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.38.0 to 0.46.0. - [Commits](https://github.com/golang/net/compare/v0.38.0...v0.46.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-version: 0.46.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
@@ -1,12 +1,12 @@
|
|||||||
module github.com/serjs/socks5-server
|
module github.com/serjs/socks5-server
|
||||||
|
|
||||||
go 1.23.0
|
go 1.24.0
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
|
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
|
||||||
github.com/caarlos0/env/v6 v6.10.1
|
github.com/caarlos0/env/v6 v6.10.1
|
||||||
)
|
)
|
||||||
|
|
||||||
require golang.org/x/net v0.38.0
|
require golang.org/x/net v0.46.0
|
||||||
|
|
||||||
replace github.com/armon/go-socks5 => github.com/serjs/go-socks5 v0.0.0-20250923183437-3920b97ee0d2
|
replace github.com/armon/go-socks5 => github.com/serjs/go-socks5 v0.0.0-20250923183437-3920b97ee0d2
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
github.com/caarlos0/env/v6 v6.10.1 h1:t1mPSxNpei6M5yAeu1qtRdPAK29Nbcf/n3G7x+b3/II=
|
github.com/caarlos0/env/v6 v6.10.1 h1:t1mPSxNpei6M5yAeu1qtRdPAK29Nbcf/n3G7x+b3/II=
|
||||||
github.com/caarlos0/env/v6 v6.10.1/go.mod h1:hvp/ryKXKipEkcuYjs9mI4bBCg+UI0Yhgm5Zu0ddvwc=
|
github.com/caarlos0/env/v6 v6.10.1/go.mod h1:hvp/ryKXKipEkcuYjs9mI4bBCg+UI0Yhgm5Zu0ddvwc=
|
||||||
github.com/serjs/go-socks5 v0.0.0-20250923182028-346d18438915 h1:fgMfP6jRY4Dq+CFFNpC0hu/tyJj35tlcJphNkutvO98=
|
|
||||||
github.com/serjs/go-socks5 v0.0.0-20250923182028-346d18438915/go.mod h1:N2PhU16m3olAb71DduLys4mYR3oQboD4uLJmSXCSuMA=
|
|
||||||
github.com/serjs/go-socks5 v0.0.0-20250923183437-3920b97ee0d2 h1:dIXY/Lrkd1rGXcN60Fc0M2x0p5/C2XcbBbtPCvVvAa4=
|
github.com/serjs/go-socks5 v0.0.0-20250923183437-3920b97ee0d2 h1:dIXY/Lrkd1rGXcN60Fc0M2x0p5/C2XcbBbtPCvVvAa4=
|
||||||
github.com/serjs/go-socks5 v0.0.0-20250923183437-3920b97ee0d2/go.mod h1:N2PhU16m3olAb71DduLys4mYR3oQboD4uLJmSXCSuMA=
|
github.com/serjs/go-socks5 v0.0.0-20250923183437-3920b97ee0d2/go.mod h1:N2PhU16m3olAb71DduLys4mYR3oQboD4uLJmSXCSuMA=
|
||||||
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
|
golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
|
||||||
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
|
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
|
||||||
|
|||||||
+21
-14
@@ -6,7 +6,7 @@
|
|||||||
// cancellation signals, and other request-scoped values across API boundaries
|
// cancellation signals, and other request-scoped values across API boundaries
|
||||||
// and between processes.
|
// and between processes.
|
||||||
// As of Go 1.7 this package is available in the standard library under the
|
// As of Go 1.7 this package is available in the standard library under the
|
||||||
// name [context], and migrating to it can be done automatically with [go fix].
|
// name [context].
|
||||||
//
|
//
|
||||||
// Incoming requests to a server should create a [Context], and outgoing
|
// Incoming requests to a server should create a [Context], and outgoing
|
||||||
// calls to servers should accept a Context. The chain of function
|
// calls to servers should accept a Context. The chain of function
|
||||||
@@ -38,8 +38,6 @@
|
|||||||
//
|
//
|
||||||
// See https://go.dev/blog/context for example code for a server that uses
|
// See https://go.dev/blog/context for example code for a server that uses
|
||||||
// Contexts.
|
// Contexts.
|
||||||
//
|
|
||||||
// [go fix]: https://go.dev/cmd/go#hdr-Update_packages_to_use_new_APIs
|
|
||||||
package context
|
package context
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -51,36 +49,37 @@ import (
|
|||||||
// API boundaries.
|
// API boundaries.
|
||||||
//
|
//
|
||||||
// Context's methods may be called by multiple goroutines simultaneously.
|
// Context's methods may be called by multiple goroutines simultaneously.
|
||||||
|
//
|
||||||
|
//go:fix inline
|
||||||
type Context = context.Context
|
type Context = context.Context
|
||||||
|
|
||||||
// Canceled is the error returned by [Context.Err] when the context is canceled
|
// Canceled is the error returned by [Context.Err] when the context is canceled
|
||||||
// for some reason other than its deadline passing.
|
// for some reason other than its deadline passing.
|
||||||
|
//
|
||||||
|
//go:fix inline
|
||||||
var Canceled = context.Canceled
|
var Canceled = context.Canceled
|
||||||
|
|
||||||
// DeadlineExceeded is the error returned by [Context.Err] when the context is canceled
|
// DeadlineExceeded is the error returned by [Context.Err] when the context is canceled
|
||||||
// due to its deadline passing.
|
// due to its deadline passing.
|
||||||
|
//
|
||||||
|
//go:fix inline
|
||||||
var DeadlineExceeded = context.DeadlineExceeded
|
var DeadlineExceeded = context.DeadlineExceeded
|
||||||
|
|
||||||
// Background returns a non-nil, empty Context. It is never canceled, has no
|
// Background returns a non-nil, empty Context. It is never canceled, has no
|
||||||
// values, and has no deadline. It is typically used by the main function,
|
// values, and has no deadline. It is typically used by the main function,
|
||||||
// initialization, and tests, and as the top-level Context for incoming
|
// initialization, and tests, and as the top-level Context for incoming
|
||||||
// requests.
|
// requests.
|
||||||
func Background() Context {
|
//
|
||||||
return background
|
//go:fix inline
|
||||||
}
|
func Background() Context { return context.Background() }
|
||||||
|
|
||||||
// TODO returns a non-nil, empty Context. Code should use context.TODO when
|
// TODO returns a non-nil, empty Context. Code should use context.TODO when
|
||||||
// it's unclear which Context to use or it is not yet available (because the
|
// it's unclear which Context to use or it is not yet available (because the
|
||||||
// surrounding function has not yet been extended to accept a Context
|
// surrounding function has not yet been extended to accept a Context
|
||||||
// parameter).
|
// parameter).
|
||||||
func TODO() Context {
|
//
|
||||||
return todo
|
//go:fix inline
|
||||||
}
|
func TODO() Context { return context.TODO() }
|
||||||
|
|
||||||
var (
|
|
||||||
background = context.Background()
|
|
||||||
todo = context.TODO()
|
|
||||||
)
|
|
||||||
|
|
||||||
// A CancelFunc tells an operation to abandon its work.
|
// A CancelFunc tells an operation to abandon its work.
|
||||||
// A CancelFunc does not wait for the work to stop.
|
// A CancelFunc does not wait for the work to stop.
|
||||||
@@ -95,6 +94,8 @@ type CancelFunc = context.CancelFunc
|
|||||||
//
|
//
|
||||||
// Canceling this context releases resources associated with it, so code should
|
// Canceling this context releases resources associated with it, so code should
|
||||||
// call cancel as soon as the operations running in this [Context] complete.
|
// call cancel as soon as the operations running in this [Context] complete.
|
||||||
|
//
|
||||||
|
//go:fix inline
|
||||||
func WithCancel(parent Context) (ctx Context, cancel CancelFunc) {
|
func WithCancel(parent Context) (ctx Context, cancel CancelFunc) {
|
||||||
return context.WithCancel(parent)
|
return context.WithCancel(parent)
|
||||||
}
|
}
|
||||||
@@ -108,6 +109,8 @@ func WithCancel(parent Context) (ctx Context, cancel CancelFunc) {
|
|||||||
//
|
//
|
||||||
// Canceling this context releases resources associated with it, so code should
|
// Canceling this context releases resources associated with it, so code should
|
||||||
// call cancel as soon as the operations running in this [Context] complete.
|
// call cancel as soon as the operations running in this [Context] complete.
|
||||||
|
//
|
||||||
|
//go:fix inline
|
||||||
func WithDeadline(parent Context, d time.Time) (Context, CancelFunc) {
|
func WithDeadline(parent Context, d time.Time) (Context, CancelFunc) {
|
||||||
return context.WithDeadline(parent, d)
|
return context.WithDeadline(parent, d)
|
||||||
}
|
}
|
||||||
@@ -122,6 +125,8 @@ func WithDeadline(parent Context, d time.Time) (Context, CancelFunc) {
|
|||||||
// defer cancel() // releases resources if slowOperation completes before timeout elapses
|
// defer cancel() // releases resources if slowOperation completes before timeout elapses
|
||||||
// return slowOperation(ctx)
|
// return slowOperation(ctx)
|
||||||
// }
|
// }
|
||||||
|
//
|
||||||
|
//go:fix inline
|
||||||
func WithTimeout(parent Context, timeout time.Duration) (Context, CancelFunc) {
|
func WithTimeout(parent Context, timeout time.Duration) (Context, CancelFunc) {
|
||||||
return context.WithTimeout(parent, timeout)
|
return context.WithTimeout(parent, timeout)
|
||||||
}
|
}
|
||||||
@@ -139,6 +144,8 @@ func WithTimeout(parent Context, timeout time.Duration) (Context, CancelFunc) {
|
|||||||
// interface{}, context keys often have concrete type
|
// interface{}, context keys often have concrete type
|
||||||
// struct{}. Alternatively, exported context key variables' static
|
// struct{}. Alternatively, exported context key variables' static
|
||||||
// type should be a pointer or interface.
|
// type should be a pointer or interface.
|
||||||
|
//
|
||||||
|
//go:fix inline
|
||||||
func WithValue(parent Context, key, val interface{}) Context {
|
func WithValue(parent Context, key, val interface{}) Context {
|
||||||
return context.WithValue(parent, key, val)
|
return context.WithValue(parent, key, val)
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+2
-2
@@ -4,7 +4,7 @@ github.com/armon/go-socks5
|
|||||||
# github.com/caarlos0/env/v6 v6.10.1
|
# github.com/caarlos0/env/v6 v6.10.1
|
||||||
## explicit; go 1.17
|
## explicit; go 1.17
|
||||||
github.com/caarlos0/env/v6
|
github.com/caarlos0/env/v6
|
||||||
# golang.org/x/net v0.38.0
|
# golang.org/x/net v0.46.0
|
||||||
## explicit; go 1.23.0
|
## explicit; go 1.24.0
|
||||||
golang.org/x/net/context
|
golang.org/x/net/context
|
||||||
# github.com/armon/go-socks5 => github.com/serjs/go-socks5 v0.0.0-20250923183437-3920b97ee0d2
|
# github.com/armon/go-socks5 => github.com/serjs/go-socks5 v0.0.0-20250923183437-3920b97ee0d2
|
||||||
|
|||||||
Reference in New Issue
Block a user