Bladeren bron

Merge pull request #148 from rod-hynes/master

	Fix: always attempt upgrade download when handshake reports new version
Rod Hynes 10 jaren geleden
bovenliggende
commit
c29ee6a145
1 gewijzigde bestanden met toevoegingen van 4 en 2 verwijderingen
  1. 4 2
      psiphon/controller.go

+ 4 - 2
psiphon/controller.go

@@ -405,8 +405,10 @@ downloadLoop:
 			break downloadLoop
 		}
 
-		// Skip download entirely when a recent download was successful
-		if time.Now().Before(lastDownloadTime.Add(DOWNLOAD_UPGRADE_STALE_PERIOD)) {
+		// Unless handshake is explicitly advertizing a new version, skip
+		// checking entirely when a recent download was successful.
+		if handshakeVersion == "" &&
+			time.Now().Before(lastDownloadTime.Add(DOWNLOAD_UPGRADE_STALE_PERIOD)) {
 			continue
 		}