Revert "vhost: set DisableKeepAlives = false and fix websocket not work"

pkg/util/util/http.go

@@ -74,4 +74,4 @@ func hasPort(host string) bool {
 		return true
 	}
 	return host[0] == '[' && strings.Contains(host, "]:")
-}
+}
\ No newline at end of file

pkg/util/vhost/http.go

@@ -17,7 +17,6 @@ package vhost
 import (
 	"bytes"
 	"context"
-	"encoding/base64"
 	"errors"
 	"fmt"
 	"log"
@@ -60,25 +59,20 @@ func NewHTTPReverseProxy(option HTTPReverseProxyOptions, vhostRouter *Routers) *
 			req.URL.Scheme = "http"
 			url := req.Context().Value(RouteInfoURL).(string)
 			oldHost := util.GetHostFromAddr(req.Context().Value(RouteInfoHost).(string))
-			rc := rp.GetRouteConfig(oldHost, url)
-			if rc != nil {
-				if rc.RewriteHost != "" {
-					req.Host = rc.RewriteHost
-				}
-				// Set {domain}.{location} as URL host here to let http transport reuse connections.
-				req.URL.Host = rc.Domain + "." + base64.StdEncoding.EncodeToString([]byte(rc.Location))
-
-				for k, v := range rc.Headers {
-					req.Header.Set(k, v)
-				}
-			} else {
-				req.URL.Host = req.Host
+			host := rp.GetRealHost(oldHost, url)
+			if host != "" {
+				req.Host = host
 			}
+			req.URL.Host = req.Host
 
+			headers := rp.GetHeaders(oldHost, url)
+			for k, v := range headers {
+				req.Header.Set(k, v)
+			}
 		},
 		Transport: &http.Transport{
 			ResponseHeaderTimeout: rp.responseHeaderTimeout,
-			IdleConnTimeout:       60 * time.Second,
+			DisableKeepAlives:     true,
 			DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
 				url := ctx.Value(RouteInfoURL).(string)
 				host := util.GetHostFromAddr(ctx.Value(RouteInfoHost).(string))
@@ -113,14 +107,6 @@ func (rp *HTTPReverseProxy) UnRegister(domain string, location string) {
 	rp.vhostRouter.Del(domain, location)
 }
 
-func (rp *HTTPReverseProxy) GetRouteConfig(domain string, location string) *RouteConfig {
-	vr, ok := rp.getVhost(domain, location)
-	if ok {
-		return vr.payload.(*RouteConfig)
-	}
-	return nil
-}
-
 func (rp *HTTPReverseProxy) GetRealHost(domain string, location string) (host string) {
 	vr, ok := rp.getVhost(domain, location)
 	if ok {

tests/ci/health/health_test.go

@@ -139,7 +139,6 @@ func TestHealthCheck(t *testing.T) {
 	}
 
 	httpSvc3 := mock.NewHTTPServer(15005, func(w http.ResponseWriter, r *http.Request) {
-		time.Sleep(time.Second)
 		w.Write([]byte("http3"))
 	})
 	err = httpSvc3.Start()
@@ -148,7 +147,6 @@ func TestHealthCheck(t *testing.T) {
 	}
 
 	httpSvc4 := mock.NewHTTPServer(15006, func(w http.ResponseWriter, r *http.Request) {
-		time.Sleep(time.Second)
 		w.Write([]byte("http4"))
 	})
 	err = httpSvc4.Start()
@@ -279,30 +277,16 @@ func TestHealthCheck(t *testing.T) {
 
 	// ****** load balancing type http ******
 	result = make([]string, 0)
-	var wait sync.WaitGroup
-	var mu sync.Mutex
-	wait.Add(2)
-
-	go func() {
-		defer wait.Done()
-		code, body, _, err := util.SendHTTPMsg("GET", "http://127.0.0.1:14000/xxx", "test.balancing.com", nil, "")
-		assert.NoError(err)
-		assert.Equal(200, code)
-		mu.Lock()
-		result = append(result, body)
-		mu.Unlock()
-	}()
-
-	go func() {
-		defer wait.Done()
-		code, body, _, err = util.SendHTTPMsg("GET", "http://127.0.0.1:14000/xxx", "test.balancing.com", nil, "")
-		assert.NoError(err)
-		assert.Equal(200, code)
-		mu.Lock()
-		result = append(result, body)
-		mu.Unlock()
-	}()
-	wait.Wait()
+
+	code, body, _, err = util.SendHTTPMsg("GET", "http://127.0.0.1:14000/xxx", "test.balancing.com", nil, "")
+	assert.NoError(err)
+	assert.Equal(200, code)
+	result = append(result, body)
+
+	code, body, _, err = util.SendHTTPMsg("GET", "http://127.0.0.1:14000/xxx", "test.balancing.com", nil, "")
+	assert.NoError(err)
+	assert.Equal(200, code)
+	result = append(result, body)
 
 	assert.Contains(result, "http3")
 	assert.Contains(result, "http4")