Merge a13b23e7ed247b2a07a796a4336fc1697b0ca4cb into 86f90f4d2709194c7537e7be4f4a6d4f379adbd4

Signed-off-by: guoguangwu <guoguangwug@gmail.com>

Release.md

@@ -1,25 +1 @@
-### Features
 
-* Support range ports mapping in TOML/YAML/JSON configuration file by using go template syntax.
-
-  For example:
-
-  ```
-  {{- range $_, $v := parseNumberRangePair "6000-6006,6007" "6000-6006,6007" }}
-  [[proxies]]
-  name = "tcp-{{ $v.First }}"
-  type = "tcp"
-  localPort = {{ $v.First }}
-  remotePort = {{ $v.Second }}
-  {{- end }}
-  ```
-
-  This will create 8 proxies such as `tcp-6000, tcp-6001, ... tcp-6007`.
-
-* Health check supports custom request headers.
-* Enable compatibility mode for the Android system to solve the issues of incorrect log time caused by time zone problems and default DNS resolution failures.
-
-### Fixes
-
-* Fix the issue of incorrect interval time for rotating the log by day.
-* Disable quic-go's ECN support by default. It may cause issues on certain operating systems.

client/proxy/proxy_wrapper.go

@@ -65,7 +65,7 @@ type Wrapper struct {
 	// underlying proxy
 	pxy Proxy
 
-	// if ProxyConf has healcheck config
+	// if ProxyConf has health check config
 	// monitor will watch if it is alive
 	monitor *health.Monitor
 

client/visitor/xtcp.go

@@ -157,9 +157,9 @@ func (sv *XTCPVisitor) keepTunnelOpenWorker() {
 
 func (sv *XTCPVisitor) handleConn(userConn net.Conn) {
 	xl := xlog.FromContextSafe(sv.ctx)
-	isConnTrasfered := false
+	isConnTransferred := false
 	defer func() {
-		if !isConnTrasfered {
+		if !isConnTransferred {
 			userConn.Close()
 		}
 	}()
@@ -187,7 +187,7 @@ func (sv *XTCPVisitor) handleConn(userConn net.Conn) {
 			xl.Errorf("transfer connection to visitor %s error: %v", sv.cfg.FallbackTo, err)
 			return
 		}
-		isConnTrasfered = true
+		isConnTransferred = true
 		return
 	}
 

package.sh

@@ -17,7 +17,7 @@ make -f ./Makefile.cross-compiles
 rm -rf ./release/packages
 mkdir -p ./release/packages
 
-os_all='linux windows darwin freebsd'
+os_all='linux windows darwin freebsd android'
 arch_all='386 amd64 arm arm64 mips64 mips64le mips mipsle riscv64'
 
 cd ./release