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 2015/02/23 14:45:46 UTC
svn commit: r1661670 -
/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
Author: markt
Date: Mon Feb 23 13:45:46 2015
New Revision: 1661670
URL: http://svn.apache.org/r1661670
Log: (empty)
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java?rev=1661670&r1=1661669&r2=1661670&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java Mon Feb 23 13:45:46 2015
@@ -55,12 +55,10 @@ public class UpgradeProcessor implements
wrapper.unRead(leftOverInput);
/*
- * Infinite read timeouts make sense since it is unknown how quickly -
- * or even if at all - a client will send data. However, leave the write
- * timeout alone since when the server writes to the client that should
- * always happen within the configured timeout.
+ * Leave timeouts in the hands of the upgraded protocol.
*/
wrapper.setReadTimeout(INFINITE_TIMEOUT);
+ wrapper.setWriteTimeout(INFINITE_TIMEOUT);
if (httpUpgradeHandler instanceof InternalHttpUpgradeHandler) {
wrapper.setInternalUpgrade(true);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1661670 - /tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
Posted by Konstantin Kolinko <kn...@gmail.com>.
2015-02-23 16:45 GMT+03:00 <ma...@apache.org>:
> Author: markt
> Date: Mon Feb 23 13:45:46 2015
> New Revision: 1661670
>
> URL: http://svn.apache.org/r1661670
> Log: (empty)
No log message here.
This is a revert of r1661642, discussed in "Re: r1661642" thread.
> Modified:
> tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
>
> Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java?rev=1661670&r1=1661669&r2=1661670&view=diff
> ==============================================================================
> --- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java (original)
> +++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java Mon Feb 23 13:45:46 2015
> @@ -55,12 +55,10 @@ public class UpgradeProcessor implements
>
> wrapper.unRead(leftOverInput);
> /*
> - * Infinite read timeouts make sense since it is unknown how quickly -
> - * or even if at all - a client will send data. However, leave the write
> - * timeout alone since when the server writes to the client that should
> - * always happen within the configured timeout.
> + * Leave timeouts in the hands of the upgraded protocol.
> */
> wrapper.setReadTimeout(INFINITE_TIMEOUT);
> + wrapper.setWriteTimeout(INFINITE_TIMEOUT);
>
> if (httpUpgradeHandler instanceof InternalHttpUpgradeHandler) {
> wrapper.setInternalUpgrade(true);
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org