Author: remm
Date: Fri Jan 4 11:34:05 2019
New Revision: 1850349
URL: http://svn.apache.org/viewvc?rev=1850349&view=rev
Log:
Fix read timeout cut paste issue.
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java?rev=1850349&r1=1850348&r2=1850349&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java Fri Jan 4
11:34:05 2019
@@ -58,7 +58,7 @@ class Http2AsyncParser extends Http2Pars
framePaylod.clear();
FrameCompletionHandler handler = new FrameCompletionHandler(expected,
header, framePaylod);
CompletionState state =
- socketWrapper.read(BlockingMode.NON_BLOCK,
socketWrapper.getWriteTimeout(), TimeUnit.MILLISECONDS, null, handler, handler,
header, framePaylod);
+ socketWrapper.read(BlockingMode.NON_BLOCK,
socketWrapper.getReadTimeout(), TimeUnit.MILLISECONDS, null, handler, handler,
header, framePaylod);
if (state == CompletionState.ERROR || state == CompletionState.INLINE)
{
handleAsyncException();
return true;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1850349&r1=1850348&r2=1850349&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan 4 11:34:05 2019
@@ -98,6 +98,10 @@
Fix socket close discrepancies for NIO2, now the wrapper close
is used everywhere except for socket accept problems. (remm)
</fix>
+ <fix>
+ Fix use of write timeout instead of read timeout for HTTP/2 NIO2
+ frame read. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Tribes">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
