Merge pull request #336 from fosrl/dev

1.12.3

common.go

@@ -279,7 +279,7 @@ func startPingCheck(tnet *netstack.Net, serverIP string, client *websocket.Clien
 
 					// More lenient threshold for declaring connection lost under load
 					failureThreshold := 4
-					if consecutiveFailures >= failureThreshold {
+					if consecutiveFailures >= failureThreshold && currentInterval < maxInterval {
 						if !connectionLost {
 							connectionLost = true
 							logger.Warn("Connection to server lost after %d failures. Continuous reconnection attempts will be made.", consecutiveFailures)
@@ -309,14 +309,12 @@ func startPingCheck(tnet *netstack.Net, serverIP string, client *websocket.Clien
 								}
 							}
 						}
-						if currentInterval < maxInterval {
+						currentInterval = time.Duration(float64(currentInterval) * 1.3) // Slower increase
-							currentInterval = time.Duration(float64(currentInterval) * 1.3) // Slower increase
+						if currentInterval > maxInterval {
-							if currentInterval > maxInterval {
+							currentInterval = maxInterval
-								currentInterval = maxInterval
-							}
-							ticker.Reset(currentInterval)
-							logger.Debug("Increased ping check interval to %v due to consecutive failures", currentInterval)
 						}
+						ticker.Reset(currentInterval)
+						logger.Debug("Increased ping check interval to %v due to consecutive failures", currentInterval)
 					}
 				} else {
 					// Track recent latencies

netstack2/http_handler.go

@@ -356,16 +356,16 @@ func (h *HTTPHandler) handleRequest(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// If the rule is HTTPS and a TLS certificate is configured, but the
+	// If the rule is plain HTTP but has a TLS certificate configured, redirect
-	// incoming request arrived over plain HTTP, redirect to HTTPS.
+	// the client to the HTTPS equivalent of the requested URL.
-	if rule.Protocol == "https" && rule.TLSCert != "" && rule.TLSKey != "" && r.TLS == nil {
+	if rule.Protocol == "http" && rule.TLSCert != "" && rule.TLSKey != "" {
 		host := r.Host
 		if host == "" {
 			host = r.URL.Host
 		}
 		httpsURL := "https://" + host + r.RequestURI
 		logger.Info("HTTP handler: redirecting %s %s -> %s (TLS cert present)", r.Method, r.URL.RequestURI(), httpsURL)
-		http.Redirect(w, r, httpsURL, http.StatusPermanentRedirect)
+		http.Redirect(w, r, httpsURL, http.StatusMovedPermanently)
 		return
 	}