Skip to content

Commit 59b61ec

Browse files
committed
proxy: start ctx
1 parent fe4cbfb commit 59b61ec

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

proxy/proxy.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,9 @@ func (p *Proxy) Start(ctx context.Context) (err error) {
346346
return fmt.Errorf("configuring listeners: %w", errors.WithDeferred(err, closeErr))
347347
}
348348

349-
p.serveListeners(ctx)
349+
// Use context without cancel to prevent listeners' context from being
350+
// canceled.
351+
p.serveListeners(context.WithoutCancel(ctx))
350352

351353
p.started = true
352354

proxy/serverquic.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func (p *Proxy) handleQUICConnection(
185185
// design specifies that for each subsequent query on a QUIC connection
186186
// the client MUST select the next available client-initiated
187187
// bidirectional stream.
188-
stream, err := conn.AcceptStream(context.WithoutCancel(ctx))
188+
stream, err := conn.AcceptStream(ctx)
189189
if err != nil {
190190
logQUICError(ctx, "accepting quic stream", err, p.logger)
191191

proxy/serverudp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func (p *Proxy) udpPacketLoop(ctx context.Context, conn *net.UDPConn, reqSema sy
9696
packet := make([]byte, n)
9797
copy(packet, b)
9898

99-
sErr := reqSema.Acquire(context.WithoutCancel(ctx))
99+
sErr := reqSema.Acquire(ctx)
100100
if sErr != nil {
101101
p.logger.ErrorContext(
102102
ctx,

0 commit comments

Comments
 (0)