fix: #50

Author: wangzihao

README.md

@@ -152,7 +152,7 @@ github地址 : https://github.com/wangzihaogithub/spring-boot-protocol
 <dependency>
   <groupId>com.github.wangzihaogithub</groupId>
   <artifactId>spring-boot-protocol</artifactId>
-  <version>2.3.28</version>
+  <version>2.3.29</version>
 </dependency>
 ```
 
@@ -164,7 +164,7 @@ github地址 : https://github.com/wangzihaogithub/spring-boot-protocol
 <dependency>
   <groupId>com.github.wangzihaogithub</groupId>
   <artifactId>netty-servlet</artifactId>
-  <version>2.3.28</version>
+  <version>2.3.29</version>
 </dependency>
 ```
 
@@ -320,7 +320,7 @@ github地址 : https://github.com/wangzihaogithub/spring-boot-protocol
         <dependency>
           <groupId>com.github.wangzihaogithub</groupId>
           <artifactId>spring-boot-protocol</artifactId>
-          <version>2.3.28</version>
+          <version>2.3.29</version>
         </dependency>
 
         2.编写代码
@@ -400,7 +400,7 @@ github地址 : https://github.com/wangzihaogithub/spring-boot-protocol
         <dependency>
           <groupId>com.github.wangzihaogithub</groupId>
           <artifactId>spring-boot-protocol</artifactId>
-          <version>2.3.28</version>
+          <version>2.3.29</version>
         </dependency>
 
         2.编写代码
@@ -489,7 +489,7 @@ github地址 : https://github.com/wangzihaogithub/spring-boot-protocol
          <dependency>
               <groupId>com.github.wangzihaogithub</groupId>
               <artifactId>spring-boot-protocol</artifactId>
-              <version>2.3.28</version>
+              <version>2.3.29</version>
         </dependency>
         
         2.编写启动类

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.github.wangzihaogithub</groupId>
     <artifactId>spring-boot-protocol</artifactId>
-    <version>2.3.28</version>
+    <version>2.3.29</version>
     <packaging>jar</packaging>
 
     <name>Spring Boot Protocol</name>
@@ -49,7 +49,7 @@
         <connection>scm:git:https://github.com/wangzihaogithub/spring-boot-protocol.git</connection>
         <developerConnection>scm:git:git@github.com:wangzihaogithub/spring-boot-protocol.git</developerConnection>
         <url>git@github.com:wangzihaogithub/spring-boot-protocol.git</url>
-        <tag>v2.3.28</tag>
+        <tag>v2.3.29</tag>
     </scm>
 
     <!-- 开发者信息 -->

src/main/java/com/github/netty/protocol/HttpServletProtocol.java

@@ -10,7 +10,7 @@
 import com.github.netty.core.util.ResourceManager;
 import com.github.netty.protocol.servlet.*;
 import com.github.netty.protocol.servlet.http2.H2Util;
-import com.github.netty.protocol.servlet.ssl.SslContextBuilders;
+import com.github.netty.protocol.servlet.SslContextBuilders;
 import com.github.netty.protocol.servlet.util.HttpConstants;
 import com.github.netty.protocol.servlet.util.*;
 import com.github.netty.protocol.servlet.websocket.WebSocketHandler;

src/main/java/com/github/netty/protocol/servlet/DefaultServlet.java

@@ -66,7 +66,7 @@ public class DefaultServlet extends HttpServlet {
     private final Set<String> homePages = new LinkedHashSet<>(Arrays.asList("index.html", "index.htm", "index"));
     private String characterEncoding = "utf-8";
     private final Map<String, String> mimeTypeMappings = new CaseInsensitiveKeyMap<>();
-    private final HttpHeaders responseHeaders = new DefaultHttpHeaders(false);
+    private final HttpHeaders responseHeaders = new DefaultHttpHeaders();
 
     public DefaultServlet() {
         DEFAULT_MIME_TYPE_MAPPINGS.forEach((k, v) -> mimeTypeMappings.put(k.toString(), v.toString()));

src/main/java/com/github/netty/protocol/servlet/NettyHttpResponse.java

@@ -36,7 +36,7 @@ public class NettyHttpResponse implements HttpResponse, Recyclable, Flushable {
     private boolean writeSendFile = false;
 
     public NettyHttpResponse() {
-        this.headers = new DefaultHttpHeaders(false);
+        this.headers = new DefaultHttpHeaders();
         this.version = HttpVersion.HTTP_1_1;
         this.status = DEFAULT_STATUS;
         this.decoderResult = DecoderResult.SUCCESS;

src/main/java/com/github/netty/protocol/servlet/NettyMessageToServletRunnable.java

@@ -42,6 +42,7 @@ public class NettyMessageToServletRunnable implements MessageToRunnable {
     private static final FullHttpResponse NOT_ACCEPTABLE_CLOSE = new DefaultFullHttpResponse(
             HttpVersion.HTTP_1_1, HttpResponseStatus.NOT_ACCEPTABLE, Unpooled.EMPTY_BUFFER);
     private static final Set<HttpMethod> HTTP_METHOD_SET = new HashSet<>(9);
+    private static final FastThreadLocal<List<Runnable>> ASYNC_CONTEXT_DISPATCH_THREAD_LOCAL = new FastThreadLocal<>();
 
     static {
         EXPECTATION_FAILED.headers().set(CONTENT_LENGTH, 0);
@@ -66,7 +67,12 @@ public class NettyMessageToServletRunnable implements MessageToRunnable {
     private ServletHttpExchange exchange;
     private /*volatile */ HttpRunnable httpRunnable;
 
-    private static final FastThreadLocal<List<Runnable>> ASYNC_CONTEXT_DISPATCH_THREAD_LOCAL = new FastThreadLocal<>();
+    public NettyMessageToServletRunnable(ServletContext servletContext, long maxContentLength, Protocol protocol, boolean ssl) {
+        this.servletContext = servletContext;
+        this.maxContentLength = maxContentLength;
+        this.protocol = protocol;
+        this.ssl = ssl;
+    }
 
     static boolean isCurrentRunAtRequesting() {
         return ASYNC_CONTEXT_DISPATCH_THREAD_LOCAL.get() != null;
@@ -79,13 +85,6 @@ static void addAsyncContextDispatch(Runnable runnable) {
         }
     }
 
-    public NettyMessageToServletRunnable(ServletContext servletContext, long maxContentLength, Protocol protocol, boolean ssl) {
-        this.servletContext = servletContext;
-        this.maxContentLength = maxContentLength;
-        this.protocol = protocol;
-        this.ssl = ssl;
-    }
-
     @Override
     public Runnable onMessage(ChannelHandlerContext context, Object msg) {
         ServletHttpExchange exchange = this.exchange;
@@ -252,7 +251,13 @@ public void run() {
             try {
                 String requestURI = request.getRequestURI();
                 if (servletContext.isMapperContextRootRedirectEnabled() && requestURI.equals(servletContext.getContextPath())) {
-                    response.sendRedirect(requestURI.concat("/"));
+                    StringBuilder redirectPath = RecyclableUtil.newStringBuilder();
+                    redirectPath.append(requestURI).append('/');
+                    String query = request.getQueryString();
+                    if (query != null) {
+                        redirectPath.append("?").append(query);
+                    }
+                    response.sendRedirect(redirectPath.toString());
                 } else {
                     dispatcher = request.getRequestDispatcher(requestURI);
                     if (dispatcher == null) {

src/main/java/com/github/netty/protocol/servlet/ServletContext.java

@@ -87,6 +87,7 @@ protected Map<Charset, DefaultHttpDataFactory> initialValue() throws Exception {
     private Servlet defaultServlet = new DefaultServlet();
     private boolean enableLookupFlag = false;
     private boolean mapperContextRootRedirectEnabled = true;
+    private boolean useRelativeRedirects = true;
     private boolean autoFlush;
     private String serverHeader;
     private CharSequence serverHeaderAscii;
@@ -197,6 +198,14 @@ public void setUploadFileTimeoutMs(long uploadFileTimeoutMs) {
         this.uploadFileTimeoutMs = uploadFileTimeoutMs;
     }
 
+    public boolean isUseRelativeRedirects() {
+        return useRelativeRedirects;
+    }
+
+    public void setUseRelativeRedirects(boolean useRelativeRedirects) {
+        this.useRelativeRedirects = useRelativeRedirects;
+    }
+
     public boolean isMapperContextRootRedirectEnabled() {
         return mapperContextRootRedirectEnabled;
     }
@@ -701,6 +710,20 @@ public ServletSessionCookieConfig getSessionCookieConfig() {
         return sessionCookieConfig;
     }
 
+    public String getSessionCookieParamName() {
+        String userSettingCookieName = sessionCookieConfig.getName();
+        return userSettingCookieName != null && !userSettingCookieName.isEmpty() ?
+                userSettingCookieName : HttpConstants.JSESSION_ID_COOKIE;
+    }
+
+    public String getSessionUriParamName() {
+        String userSettingCookieName = sessionCookieConfig.getName();
+        if (userSettingCookieName == null || userSettingCookieName.isEmpty()) {
+            userSettingCookieName = HttpConstants.JSESSION_ID_URL;
+        }
+        return userSettingCookieName;
+    }
+
     @Override
     public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes) {
         sessionTrackingModeSet = sessionTrackingModes;
@@ -714,7 +737,7 @@ public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
     @Override
     public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
         if (sessionTrackingModeSet == null) {
-            return getDefaultSessionTrackingModes();
+            return defaultSessionTrackingModeSet;
         }
         return sessionTrackingModeSet;
     }

src/main/java/com/github/netty/protocol/servlet/ServletHttpAsyncRequest.java

@@ -130,6 +130,7 @@ public String getQueryString() {
             if (decodePathsQueryIndex != -1) {
                 this.queryString = requestURI.substring(decodePathsQueryIndex + 1);
             }
+            getQueryStringFlag = true;
         }
         return this.queryString;
     }
@@ -148,6 +149,7 @@ public String getRequestURI() {
             } else {
                 this.requestURI = dispatchPath.substring(0, decodePathsQueryIndex);
             }
+            getRequestURIFlag = true;
         }
         return this.requestURI;
     }
@@ -202,11 +204,6 @@ public Map<String, String[]> getParameterMap() {
         return parameterMap;
     }
 
-    public void setParameterMap(Map<String, String[]> parameterMap) {
-        this.parameterMap = parameterMap;
-        this.decodeParameterFlag = true;
-    }
-
     @Override
     public String getParameter(String name) {
         String[] values = getParameterMap().get(name);

src/main/java/com/github/netty/protocol/servlet/ServletHttpForwardRequest.java

@@ -127,6 +127,7 @@ public String getQueryString() {
             if (decodePathsQueryIndex != -1) {
                 this.queryString = requestURI.substring(decodePathsQueryIndex + 1);
             }
+            getQueryStringFlag = true;
         }
         return this.queryString;
     }
@@ -145,6 +146,7 @@ public String getRequestURI() {
             } else {
                 this.requestURI = forwardPath.substring(0, decodePathsQueryIndex);
             }
+            getRequestURIFlag = true;
         }
         return this.requestURI;
     }

src/main/java/com/github/netty/protocol/servlet/ServletHttpIncludeRequest.java

@@ -127,6 +127,7 @@ public String getQueryString() {
             if (decodePathsQueryIndex != -1) {
                 this.queryString = requestURI.substring(decodePathsQueryIndex + 1);
             }
+            getQueryStringFlag = true;
         }
         return this.queryString;
     }
@@ -145,6 +146,7 @@ public String getRequestURI() {
             } else {
                 this.requestURI = includePath.substring(0, decodePathsQueryIndex);
             }
+            getRequestURIFlag = true;
         }
         return this.requestURI;
     }