Bläddra i källkod

XHTTP `downloadSettings`: Inherit `sockopt` if its own doesn't exist (e.g., in `extra`)

If you want `downloadSettings` to use its own `sockopt`, make sure that `extra` doesn't exist.
RPRX 10 månader sedan
förälder
incheckning
9dbdf92c27
1 ändrade filer med 3 tillägg och 0 borttagningar
  1. 3 0
      transport/internet/splithttp/dialer.go

+ 3 - 0
transport/internet/splithttp/dialer.go

@@ -308,6 +308,9 @@ func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.Me
 		globalDialerAccess.Lock()
 		if streamSettings.DownloadSettings == nil {
 			streamSettings.DownloadSettings = common.Must2(internet.ToMemoryStreamConfig(transportConfiguration.DownloadSettings)).(*internet.MemoryStreamConfig)
+			if streamSettings.DownloadSettings.SocketSettings == nil {
+				streamSettings.DownloadSettings.SocketSettings = streamSettings.SocketSettings
+			}
 		}
 		globalDialerAccess.Unlock()
 		memory2 := streamSettings.DownloadSettings