Merge pull request #2979 from MegaManSec/nil2

jedisct1 · web-flow · commit da97a9cfdff3 · 2025-09-22T17:16:52.000+02:00
Set http2Transport.ReadIdleTimeout and AllowHTTP correctly
diff --git a/dnscrypt-proxy/xtransport.go b/dnscrypt-proxy/xtransport.go
@@ -281,7 +281,7 @@ func (xTransport *XTransport) rebuildTransport() {
 		}
 	}
 	transport.TLSClientConfig = &tlsClientConfig
-	if http2Transport, err := http2.ConfigureTransports(transport); err != nil {
+	if http2Transport, err := http2.ConfigureTransports(transport); err == nil {
 		http2Transport.ReadIdleTimeout = timeout
 		http2Transport.AllowHTTP = false
 	}

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ func (xTransport *XTransport) rebuildTransport() {`
`281`	`281`	`}`
`282`	`282`	`}`
`283`	`283`	`transport.TLSClientConfig = &tlsClientConfig`
`284`		`- if http2Transport, err := http2.ConfigureTransports(transport); err != nil {`
	`284`	`+ if http2Transport, err := http2.ConfigureTransports(transport); err == nil {`
`285`	`285`	`http2Transport.ReadIdleTimeout = timeout`
`286`	`286`	`http2Transport.AllowHTTP = false`
`287`	`287`	`}`