Merge from remote branch

listener/http/hack.go

@@ -7,4 +7,4 @@ import (
 )
 
 //go:linkname ReadRequest net/http.readRequest
-func ReadRequest(b *bufio.Reader, deleteHostHeader bool) (req *http.Request, err error)
+func ReadRequest(b *bufio.Reader) (req *http.Request, err error)

listener/http/proxy.go

@@ -24,7 +24,7 @@ func HandleConn(c net.Conn, in chan<- C.ConnContext, cache *cache.Cache) {
 	trusted := cache == nil // disable authenticate if cache is nil
 
 	for keepAlive {
-		request, err := ReadRequest(conn.Reader(), false)
+		request, err := ReadRequest(conn.Reader())
 		if err != nil {
 			break
 		}

listener/redir/tcp_linux_other.go

@@ -1,3 +1,4 @@
+//go:build linux && !386
 // +build linux,!386
 
 package redir

listener/redir/tcp_other.go

@@ -1,3 +1,4 @@
+//go:build !darwin && !linux && !freebsd
 // +build !darwin,!linux,!freebsd
 
 package redir

listener/tproxy/setsockopt_linux.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package tproxy

listener/tproxy/setsockopt_other.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package tproxy

listener/tproxy/udp_linux.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package tproxy

listener/tproxy/udp_other.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package tproxy