fix: release bug

monkeyWie · Apr 28, 2021 · e65f6a2 · e65f6a2
1 parent 5e00725
commit e65f6a2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/README.md b/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.4.2</version>
+    <version>1.4.3</version>
 </dependency>
 ```
 

diff --git a/README_zh-CN.md b/README_zh-CN.md
@@ -25,7 +25,7 @@ Proxyee 是一个 JAVA 编写的 HTTP 代理服务器类库，支持 HTTP、HTTP
 <dependency>
     <groupId>com.github.monkeywie</groupId>
     <artifactId>proxyee</artifactId>
-    <version>1.4.2</version>
+    <version>1.4.3</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.github.monkeywie</groupId>
     <artifactId>proxyee</artifactId>
-    <version>1.4.2</version>
+    <version>1.4.3</version>
     <build>
         <plugins>
             <plugin>

diff --git a/src/main/java/com/github/monkeywie/proxyee/intercept/common/FullResponseIntercept.java b/src/main/java/com/github/monkeywie/proxyee/intercept/common/FullResponseIntercept.java
@@ -34,19 +34,25 @@ public final void afterResponse(Channel clientChannel, Channel proxyChannel,
             // 判断是第一个处理FullResponse的拦截器是否匹配
             boolean isFirstMatch = isMatch != null && isMatch == true;
             // 判断后续的拦截器是否匹配
-            boolean isAfterMatch = isFirstMatch ? false : matchHandle(pipeline.getHttpRequest(), pipeline.getHttpResponse(), pipeline);
+            boolean isAfterMatch = isFirstMatch ? false : match(pipeline.getHttpRequest(), pipeline.getHttpResponse(), pipeline);
             if (isFirstMatch || isAfterMatch) {
                 handleResponse(pipeline.getHttpRequest(), fullHttpResponse, pipeline);
                 if (fullHttpResponse.headers().contains(HttpHeaderNames.CONTENT_LENGTH)) {
                     httpResponse.headers().set(HttpHeaderNames.CONTENT_LENGTH, fullHttpResponse.content().readableBytes());
                 }
+                if (pipeline.getHttpRequest() instanceof FullHttpRequest) {
+                    FullHttpRequest fullHttpRequest = (FullHttpRequest) pipeline.getHttpRequest();
+                    if (fullHttpRequest.content().refCnt() > 0) {
+                        ReferenceCountUtil.release(fullHttpRequest);
+                    }
+                }
             }
             if (isFirstMatch) {
                 proxyChannel.pipeline().remove("decompress");
                 proxyChannel.pipeline().remove("aggregator");
             }
         } else {
-            this.isMatch = matchHandle(pipeline.getHttpRequest(), pipeline.getHttpResponse(), pipeline);
+            this.isMatch = match(pipeline.getHttpRequest(), pipeline.getHttpResponse(), pipeline);
             if (this.isMatch) {
                 proxyChannel.pipeline().addAfter("httpCodec", "decompress", new HttpContentDecompressor());
                 proxyChannel.pipeline()
@@ -70,18 +76,6 @@ protected boolean isHtml(HttpRequest httpRequest, HttpResponse httpResponse) {
                 .matches("^text/html.*$");
     }
 
-    private boolean matchHandle(HttpRequest httpRequest, HttpResponse httpResponse,
-                                HttpProxyInterceptPipeline pipeline) {
-        boolean isMatch = match(httpRequest, httpResponse, pipeline);
-        if (httpRequest instanceof FullHttpRequest) {
-            FullHttpRequest fullHttpRequest = (FullHttpRequest) httpRequest;
-            if (fullHttpRequest.content().refCnt() > 0) {
-                ReferenceCountUtil.release(fullHttpRequest);
-            }
-        }
-        return isMatch;
-    }
-
     /**
      * 匹配到的响应会解码成FullResponse
      */