Author: markt
Date: Mon Jul 1 14:28:40 2013
New Revision: 1498479
URL: http://svn.apache.org/r1498479
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55160
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1498475
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1498479&r1=1498478&r2=1498479&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
Mon Jul 1 14:28:40 2013
@@ -414,9 +414,14 @@ public class InternalNioInputBuffer exte
// Ignore
}
try {
- NioEndpoint.KeyAttachment att =
(NioEndpoint.KeyAttachment)socket.getAttachment(false);
- if ( att == null ) throw new IOException("Key must be
cancelled.");
- nRead =
pool.read(socket.getBufHandler().getReadBuffer(),socket,selector,att.getTimeout());
+ NioEndpoint.KeyAttachment att =
+ (NioEndpoint.KeyAttachment)
socket.getAttachment(false);
+ if (att == null) {
+ throw new IOException("Key must be cancelled.");
+ }
+ nRead = pool.read(socket.getBufHandler().getReadBuffer(),
+ socket, selector,
+ socket.getIOChannel().socket().getSoTimeout());
} catch ( EOFException eof ) {
nRead = -1;
} finally {
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1498479&r1=1498478&r2=1498479&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jul 1 14:28:40 2013
@@ -129,6 +129,10 @@
<bug>55155</bug>: Avoid constant focus grabbing when running the Tomcat
unit tests under Java 6 on OSX. Patch provided by Casey Lucas. (markt)
</fix>
+ <fix>
+ <bug>55160</bug>: Don't ignore connectionUploadTimeout setting when
+ using HTTP NIO connector. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
