Răsfoiți Sursa

Update vendored Psiphon-Labs/quic-go

- Stop quic-go timers to immediately release resources
Rod Hynes 6 ani în urmă
părinte
comite
304048e09a

+ 6 - 0
vendor/github.com/Psiphon-Labs/quic-go/receive_stream.go

@@ -156,6 +156,12 @@ func (s *receiveStream) readImpl(p []byte) (bool /*stream completed */, int, err
 			}
 		}
 
+		// [Psiphon]
+		// Stop timer to immediately release resources
+		if deadlineTimer != nil {
+			deadlineTimer.Reset(time.Time{})
+		}
+
 		if bytesRead > len(p) {
 			return false, bytesRead, fmt.Errorf("BUG: bytesRead (%d) > len(p) (%d) in stream.Read", bytesRead, len(p))
 		}

+ 6 - 0
vendor/github.com/Psiphon-Labs/quic-go/send_stream.go

@@ -141,6 +141,12 @@ func (s *sendStream) Write(p []byte) (int, error) {
 		s.mutex.Lock()
 	}
 
+	// [Psiphon]
+	// Stop timer to immediately release resources
+	if deadlineTimer != nil {
+		deadlineTimer.Reset(time.Time{})
+	}
+
 	if s.closeForShutdownErr != nil {
 		return bytesWritten, s.closeForShutdownErr
 	} else if s.cancelWriteErr != nil {

+ 4 - 0
vendor/github.com/Psiphon-Labs/quic-go/session.go

@@ -543,6 +543,10 @@ runLoop:
 		}
 	}
 
+	// [Psiphon]
+	// Stop timer to immediately release resources
+	s.timer.Reset(time.Time{})
+
 	s.handleCloseError(closeErr)
 	s.logger.Infof("Connection %s closed.", s.logID)
 	s.cryptoStreamHandler.Close()

+ 25 - 25
vendor/vendor.json

@@ -63,76 +63,76 @@
 			"revisionTime": "2019-12-04T18:36:04Z"
 		},
 		{
-			"checksumSHA1": "oFGg863D73zxq4gEcS8ymUDNCvg=",
+			"checksumSHA1": "U17xXbd9SGtoPeI5tDIkcJ8ybZs=",
 			"path": "github.com/Psiphon-Labs/quic-go",
-			"revision": "245630690d410cfa7b4e3615eb2cdddba62690d3",
-			"revisionTime": "2019-12-09T18:20:51Z"
+			"revision": "bde3cbc937f9bb5eb7fb34ec82a5a530b39a43ca",
+			"revisionTime": "2019-12-09T20:01:15Z"
 		},
 		{
 			"checksumSHA1": "VMJLFpeoJ56PTQxR0wEkkiQTr1s=",
 			"path": "github.com/Psiphon-Labs/quic-go/http3",
-			"revision": "245630690d410cfa7b4e3615eb2cdddba62690d3",
-			"revisionTime": "2019-12-09T18:20:51Z"
+			"revision": "bde3cbc937f9bb5eb7fb34ec82a5a530b39a43ca",
+			"revisionTime": "2019-12-09T20:01:15Z"
 		},
 		{
 			"checksumSHA1": "arNC0xzgLc4ZYyItIN7phkPKtek=",
 			"path": "github.com/Psiphon-Labs/quic-go/internal/ackhandler",
-			"revision": "245630690d410cfa7b4e3615eb2cdddba62690d3",
-			"revisionTime": "2019-12-09T18:20:51Z"
+			"revision": "bde3cbc937f9bb5eb7fb34ec82a5a530b39a43ca",
+			"revisionTime": "2019-12-09T20:01:15Z"
 		},
 		{
 			"checksumSHA1": "umHqolZ17yo8VoXycC9eRvlbkO8=",
 			"path": "github.com/Psiphon-Labs/quic-go/internal/congestion",
-			"revision": "245630690d410cfa7b4e3615eb2cdddba62690d3",
-			"revisionTime": "2019-12-09T18:20:51Z"
+			"revision": "bde3cbc937f9bb5eb7fb34ec82a5a530b39a43ca",
+			"revisionTime": "2019-12-09T20:01:15Z"
 		},
 		{
 			"checksumSHA1": "l2U3fJvz7V2qSonhmdu5jzjRiVA=",
 			"path": "github.com/Psiphon-Labs/quic-go/internal/flowcontrol",
-			"revision": "245630690d410cfa7b4e3615eb2cdddba62690d3",
-			"revisionTime": "2019-12-09T18:20:51Z"
+			"revision": "bde3cbc937f9bb5eb7fb34ec82a5a530b39a43ca",
+			"revisionTime": "2019-12-09T20:01:15Z"
 		},
 		{
 			"checksumSHA1": "+kFrUAIuBtByAQvoimG1qtAk7OA=",
 			"path": "github.com/Psiphon-Labs/quic-go/internal/handshake",
-			"revision": "245630690d410cfa7b4e3615eb2cdddba62690d3",
-			"revisionTime": "2019-12-09T18:20:51Z"
+			"revision": "bde3cbc937f9bb5eb7fb34ec82a5a530b39a43ca",
+			"revisionTime": "2019-12-09T20:01:15Z"
 		},
 		{
 			"checksumSHA1": "6yCbl48zYO+1YX3T36iPt+bwvsY=",
 			"path": "github.com/Psiphon-Labs/quic-go/internal/protocol",
-			"revision": "245630690d410cfa7b4e3615eb2cdddba62690d3",
-			"revisionTime": "2019-12-09T18:20:51Z"
+			"revision": "bde3cbc937f9bb5eb7fb34ec82a5a530b39a43ca",
+			"revisionTime": "2019-12-09T20:01:15Z"
 		},
 		{
 			"checksumSHA1": "RfG1431vMrJq9QLoTw82iqKM60I=",
 			"path": "github.com/Psiphon-Labs/quic-go/internal/qerr",
-			"revision": "245630690d410cfa7b4e3615eb2cdddba62690d3",
-			"revisionTime": "2019-12-09T18:20:51Z"
+			"revision": "bde3cbc937f9bb5eb7fb34ec82a5a530b39a43ca",
+			"revisionTime": "2019-12-09T20:01:15Z"
 		},
 		{
 			"checksumSHA1": "yE18mLWfFblPiprkNDVm/OZBksA=",
 			"path": "github.com/Psiphon-Labs/quic-go/internal/utils",
-			"revision": "245630690d410cfa7b4e3615eb2cdddba62690d3",
-			"revisionTime": "2019-12-09T18:20:51Z"
+			"revision": "bde3cbc937f9bb5eb7fb34ec82a5a530b39a43ca",
+			"revisionTime": "2019-12-09T20:01:15Z"
 		},
 		{
 			"checksumSHA1": "IHqcabVUhdoVAeaj7yxH1Khu3+o=",
 			"path": "github.com/Psiphon-Labs/quic-go/internal/wire",
-			"revision": "245630690d410cfa7b4e3615eb2cdddba62690d3",
-			"revisionTime": "2019-12-09T18:20:51Z"
+			"revision": "bde3cbc937f9bb5eb7fb34ec82a5a530b39a43ca",
+			"revisionTime": "2019-12-09T20:01:15Z"
 		},
 		{
 			"checksumSHA1": "GazFEGFAJrK5DThTfhgeVQSokeY=",
 			"path": "github.com/Psiphon-Labs/quic-go/quictrace",
-			"revision": "245630690d410cfa7b4e3615eb2cdddba62690d3",
-			"revisionTime": "2019-12-09T18:20:51Z"
+			"revision": "bde3cbc937f9bb5eb7fb34ec82a5a530b39a43ca",
+			"revisionTime": "2019-12-09T20:01:15Z"
 		},
 		{
 			"checksumSHA1": "UdV2crvbY4riGxH6tn0dNrT40b0=",
 			"path": "github.com/Psiphon-Labs/quic-go/quictrace/pb",
-			"revision": "245630690d410cfa7b4e3615eb2cdddba62690d3",
-			"revisionTime": "2019-12-09T18:20:51Z"
+			"revision": "bde3cbc937f9bb5eb7fb34ec82a5a530b39a43ca",
+			"revisionTime": "2019-12-09T20:01:15Z"
 		},
 		{
 			"checksumSHA1": "+lsQUKG+zIU9IxrQf5pJBSRE79Q=",