fix: forward connect keep alive issue (#228)

Author: monkeyWie

.gitignore

@@ -1,3 +1,5 @@
+.DS_Store/
+
 *.class
 
 # BlueJ files

README.md

@@ -25,7 +25,7 @@ Proxyee is a JAVA written HTTP proxy server library that supports HTTP, HTTPS, W
 <dependency>
     <groupId>com.github.monkeywie</groupId>
     <artifactId>proxyee</artifactId>
-    <version>1.6.7</version>
+    <version>1.6.8</version>
 </dependency>
 ```
 

README_zh-CN.md

@@ -25,7 +25,7 @@ Proxyee 是一个 JAVA 编写的 HTTP 代理服务器类库，支持 HTTP、HTTP
 <dependency>
     <groupId>com.github.monkeywie</groupId>
     <artifactId>proxyee</artifactId>
-    <version>1.6.7</version>
+    <version>1.6.8</version>
 </dependency>
 ```
 

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.github.monkeywie</groupId>
     <artifactId>proxyee</artifactId>
-    <version>1.6.7</version>
+    <version>1.6.8</version>
 
     <packaging>jar</packaging>
 

src/main/java/com/github/monkeywie/proxyee/handler/HttpProxyServerHandler.java

@@ -275,7 +275,25 @@ private boolean authenticate(ChannelHandlerContext ctx, HttpRequest request) {
     }
 
     private void handleProxyData(Channel channel, Object msg, boolean isHttp) throws Exception {
-        if (getChannelFuture() == null) {
+        RequestProto pipeRp = getInterceptPipeline().getRequestProto();
+        boolean isChangeRp = false;
+        if (isHttp && msg instanceof HttpRequest) {
+            HttpRequest httpRequest = (HttpRequest) msg;
+            // 检查requestProto是否有修改
+            RequestProto newRP = ProtoUtil.getRequestProto(httpRequest);
+            if (!newRP.equals(pipeRp)) {
+                isChangeRp = true;
+                // 更新Host请求头
+                if ((pipeRp.getSsl() && pipeRp.getPort() == 443)
+                        || (!pipeRp.getSsl() && pipeRp.getPort() == 80)) {
+                    httpRequest.headers().set(HttpHeaderNames.HOST, pipeRp.getHost());
+                } else {
+                    httpRequest.headers().set(HttpHeaderNames.HOST, pipeRp.getHost() + ":" + pipeRp.getPort());
+                }
+            }
+        }
+
+        if (isChangeRp || getChannelFuture() == null) {
             // connection异常 还有HttpContent进来，不转发
             if (isHttp && !(msg instanceof HttpRequest)) {
                 return;
@@ -290,22 +308,6 @@ private void handleProxyData(Channel channel, Object msg, boolean isHttp) throws
             ProxyHandler proxyHandler = ProxyHandleFactory.build(getInterceptPipeline().getProxyConfig() == null ?
                     proxyConfig : getInterceptPipeline().getProxyConfig());
 
-            RequestProto pipeRp = getInterceptPipeline().getRequestProto();
-            if (isHttp) {
-                HttpRequest httpRequest = (HttpRequest) msg;
-                // 检查requestProto是否有修改
-                RequestProto newRP = ProtoUtil.getRequestProto(httpRequest);
-                if (!newRP.equals(pipeRp)) {
-                    // 更新Host请求头
-                    if ((pipeRp.getSsl() && pipeRp.getPort() == 443)
-                            || (!pipeRp.getSsl() && pipeRp.getPort() == 80)) {
-                        httpRequest.headers().set(HttpHeaderNames.HOST, pipeRp.getHost());
-                    } else {
-                        httpRequest.headers().set(HttpHeaderNames.HOST, pipeRp.getHost() + ":" + pipeRp.getPort());
-                    }
-                }
-            }
-
             /*
              * 添加SSL client hello的Server Name Indication extension(SNI扩展) 有些服务器对于client
              * hello不带SNI扩展时会直接返回Received fatal alert: handshake_failure(握手错误)