You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/12/14 11:04:19 UTC
svn commit: r1774170 - in /tomcat/trunk/java/org/apache/coyote/http11:
AbstractHttp11Protocol.java Http11Processor.java
Author: markt
Date: Wed Dec 14 11:04:19 2016
New Revision: 1774170
URL: http://svn.apache.org/viewvc?rev=1774170&view=rev
Log:
Don't duplicate storage of upload timeouts in the Processor
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1774170&r1=1774169&r2=1774170&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Wed Dec 14 11:04:19 2016
@@ -105,15 +105,22 @@ public abstract class AbstractHttp11Prot
public int getMaxHttpHeaderSize() { return maxHttpHeaderSize; }
public void setMaxHttpHeaderSize(int valueI) { maxHttpHeaderSize = valueI; }
-
+ /**
+ * Maximum timeout on uploads. 5 minutes as in Apache HTTPD server.
+ */
+ private int connectionUploadTimeout = 300000;
/**
* Specifies a different (usually longer) connection timeout during data
* upload.
*/
- private int connectionUploadTimeout = 300000;
public int getConnectionUploadTimeout() { return connectionUploadTimeout; }
- public void setConnectionUploadTimeout(int i) {
- connectionUploadTimeout = i;
+ /**
+ * Set the upload timeout.
+ *
+ * @param timeout Upload timeout in milliseconds
+ */
+ public void setConnectionUploadTimeout(int timeout) {
+ connectionUploadTimeout = timeout;
}
@@ -122,7 +129,19 @@ public abstract class AbstractHttp11Prot
* socket timeout will be used for the full duration of the connection.
*/
private boolean disableUploadTimeout = true;
+ /**
+ * Get the flag that controls upload time-outs.
+ *
+ * @return {@code true} if the separate upload timeout is disabled
+ */
public boolean getDisableUploadTimeout() { return disableUploadTimeout; }
+ /**
+ * Set the flag to control whether a separate connection timeout is used
+ * during upload of a request body.
+ *
+ * @param isDisabled {@code true} if the separate upload timeout should be
+ * disabled
+ */
public void setDisableUploadTimeout(boolean isDisabled) {
disableUploadTimeout = isDisabled;
}
@@ -648,8 +667,6 @@ public abstract class AbstractHttp11Prot
protected Processor createProcessor() {
Http11Processor processor = new Http11Processor(this);
processor.setAdapter(getAdapter());
- processor.setConnectionUploadTimeout(getConnectionUploadTimeout());
- processor.setDisableUploadTimeout(getDisableUploadTimeout());
processor.setCompressionMinSize(getCompressionMinSize());
processor.setCompression(getCompression());
processor.setNoCompressionUserAgents(getNoCompressionUserAgents());
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1774170&r1=1774169&r2=1774170&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Wed Dec 14 11:04:19 2016
@@ -135,18 +135,6 @@ public class Http11Processor extends Abs
/**
- * Maximum timeout on uploads. 5 minutes as in Apache HTTPD server.
- */
- protected int connectionUploadTimeout = 300000;
-
-
- /**
- * Flag to disable setting a different time-out on uploads.
- */
- protected boolean disableUploadTimeout = false;
-
-
- /**
* Allowed compression level.
*/
protected int compressionLevel = 0;
@@ -393,45 +381,6 @@ public class Http11Processor extends Abs
/**
- * Set the flag to control whether a separate connection timeout is used
- * during upload of a request body.
- *
- * @param isDisabled {@code true} if the separate upload timeout should be
- * disabled
- */
- public void setDisableUploadTimeout(boolean isDisabled) {
- disableUploadTimeout = isDisabled;
- }
-
- /**
- * Get the flag that controls upload time-outs.
- *
- * @return {@code true} if the separate upload timeout is disabled
- */
- public boolean getDisableUploadTimeout() {
- return disableUploadTimeout;
- }
-
- /**
- * Set the upload timeout.
- *
- * @param timeout Upload timeout in milliseconds
- */
- public void setConnectionUploadTimeout(int timeout) {
- connectionUploadTimeout = timeout ;
- }
-
- /**
- * Get the upload timeout.
- *
- * @return Upload timeout in milliseconds
- */
- public int getConnectionUploadTimeout() {
- return connectionUploadTimeout;
- }
-
-
- /**
* Set the server header name.
*
* @param server The new value to use for the server header
@@ -650,8 +599,8 @@ public class Http11Processor extends Abs
readComplete = false;
break;
}
- if (!disableUploadTimeout) {
- socketWrapper.setReadTimeout(connectionUploadTimeout);
+ if (!protocol.getDisableUploadTimeout()) {
+ socketWrapper.setReadTimeout(protocol.getConnectionUploadTimeout());
}
}
} catch (IOException e) {
@@ -802,7 +751,7 @@ public class Http11Processor extends Abs
}
}
- if (!disableUploadTimeout) {
+ if (!protocol.getDisableUploadTimeout()) {
int connectionTimeout = endpoint.getConnectionTimeout();
if(connectionTimeout > 0) {
socketWrapper.setReadTimeout(connectionTimeout);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org