(tomcat) 01/04: Revert unnecessary changes for HTTP/2 request/response recycling

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 00da7f8a9da36c4877126cc94be3d4e58c7e9585
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Aug 2 10:36:54 2024 +0100

    Revert unnecessary changes for HTTP/2 request/response recycling
---
 java/org/apache/catalina/connector/CoyoteAdapter.java | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java 
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 7231d93fe2..2ca2280c1f 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -311,19 +311,20 @@ public class CoyoteAdapter implements Adapter {
             // Create objects
             request = connector.createRequest();
             request.setCoyoteRequest(req);
-            req.setNote(ADAPTER_NOTES, request);
-            
req.getParameters().setQueryStringCharset(connector.getURICharset());
-        }
-
-        if (response == null) {
             response = connector.createResponse();
             response.setCoyoteResponse(res);
+
+            // Link objects
+            request.setResponse(response);
+            response.setRequest(request);
+
+            // Set as notes
+            req.setNote(ADAPTER_NOTES, request);
             res.setNote(ADAPTER_NOTES, response);
-        }
 
-        // Link objects
-        request.setResponse(response);
-        response.setRequest(request);
+            // Set query string encoding
+            
req.getParameters().setQueryStringCharset(connector.getURICharset());
+        }
 
         if (connector.getXpoweredBy()) {
             response.addHeader("X-Powered-By", POWERED_BY);


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org