michael-o commented on a change in pull request #332: URL: https://github.com/apache/tomcat/pull/332#discussion_r466167274
########## File path: java/org/apache/coyote/ContinueHandlingResponsePolicy.java ########## @@ -0,0 +1,37 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.coyote; + +/** + * Enum defining policies on responding to '100-continue' expectations. + */ +public enum ContinueHandlingResponsePolicy { + /** + * Tomcat will automatically and always send the 100 intermediate response Review comment: It will not always send 100, only on the case the request is eligible for 100. ########## File path: java/org/apache/coyote/ContinueHandlingResponsePolicy.java ########## @@ -0,0 +1,37 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.coyote; + +/** + * Enum defining policies on responding to '100-continue' expectations. + */ +public enum ContinueHandlingResponsePolicy { + /** + * Tomcat will automatically and always send the 100 intermediate response + * + * This is the default behavior + */ + IMMEDIATELY, + + /** + * Send the 100 intermediate response only when the servlet attempts to + * read the request's body. This allows the servlet to process the + * request headers and possibly respond before asking for the request Review comment: The text is confusing. You are saying: "attempt to read the request body", but in the next sentence you say "before asking for the request body". So does one have to invoke `request#getInputStream()`? ########## File path: java/org/apache/catalina/connector/Response.java ########## @@ -1197,16 +1197,12 @@ public String encodeUrl(String url) { public void sendAcknowledgement() throws IOException { - if (isCommitted()) { Review comment: The move to `sendAcknowledgement()` changes the behavior, doesn't it? ########## File path: java/org/apache/coyote/AbstractProtocol.java ########## @@ -262,6 +267,18 @@ public void setConnectionLinger(int connectionLinger) { endpoint.setConnectionLinger(connectionLinger); } + // ------------------------------------------------ HTTP specific properties + // ----------------------------------------- queried by StandardContextValve + public void setContinueHandlingResponsePolicy(String value) { + continueHandlingResponsePolicy = Enum.valueOf(ContinueHandlingResponsePolicy.class, value); + } + + + //todo(malay) move to AbstractProtocol Review comment: What does `malay` mean? Like Malay language? ########## File path: java/org/apache/coyote/Request.java ########## @@ -709,4 +718,13 @@ private static String getCharsetFromContentType(String contentType) { return encoding.trim(); } + + /** + * set whether to acknowledge the request when the request body is + * first read from + * @param acknowledgeOnFirstRead the value to set + */ + public void setAcknowledgeOnRequestBodyRead(boolean acknowledgeOnFirstRead) { Review comment: Why does the arg has a different name than the instane field? ########## File path: test/org/apache/catalina/core/TestStandardContextValve.java ########## @@ -182,4 +184,66 @@ public void requestDestroyed(ServletRequestEvent sre) { } } + + @Test + public void test100ContinueDefaultPolicy() throws Exception { + // the default policy is IMMEDIATELY + // This test verifies that we get proper 100 Continue responses + // when the continueHandlingResponsePolicy property is not set + final Tomcat tomcat = getTomcatInstance(); + + final Connector connector = tomcat.getConnector(); + connector.setProperty("continueHandlingResponsePolicy", "IMMEDIATELY"); + + test100Continue(); + } + + @Test + public void test100ContinueSentImmediately() throws Exception { + final Tomcat tomcat = getTomcatInstance(); + + final Connector connector = tomcat.getConnector(); + connector.setProperty("continueHandlingResponsePolicy", "IMMEDIATELY"); + + test100Continue(); + } + + @Test + public void test100ContinueSentOnRequestContentRead() throws Exception { + final Tomcat tomcat = getTomcatInstance(); + + final Connector connector = tomcat.getConnector(); + connector.setProperty("continueHandlingResponsePolicy", "ON_REQUEST_CONTENT_READ"); + + test100Continue(); + } + + public void test100Continue() throws Exception { Review comment: I am bit confused by the test. How does it verify that the new behavior works if the test is identical for both cases? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
