Author: markt
Date: Tue Oct 20 12:11:46 2015
New Revision: 1709579
URL: http://svn.apache.org/viewvc?rev=1709579&view=rev
Log:
Implement async timeout for HTTP/2
Align ASYNC_SETTIMOUT implementations across processors
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1709579&r1=1709578&r2=1709579&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Tue Oct 20
12:11:46 2015
@@ -515,8 +515,10 @@ public class AjpProcessor extends Abstra
break;
}
case ASYNC_SETTIMEOUT: {
- if (param == null) return;
- long timeout = ((Long)param).longValue();
+ if (param == null) {
+ return;
+ }
+ long timeout = ((Long) param).longValue();
setAsyncTimeout(timeout);
break;
}
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=1709579&r1=1709578&r2=1709579&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue Oct 20
12:11:46 2015
@@ -738,7 +738,7 @@ public class Http11Processor extends Abs
break;
}
case ASYNC_SETTIMEOUT: {
- if (param == null || socketWrapper == null) {
+ if (param == null) {
return;
}
long timeout = ((Long) param).longValue();
Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1709579&r1=1709578&r2=1709579&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Tue Oct 20
12:11:46 2015
@@ -305,7 +305,11 @@ public class StreamProcessor extends Abs
break;
}
case ASYNC_SETTIMEOUT: {
- // TODO
+ if (param == null) {
+ return;
+ }
+ long timeout = ((Long) param).longValue();
+ setAsyncTimeout(timeout);
break;
}
case ASYNC_TIMEOUT: {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
