Author: fhanik
Date: Thu Jan 24 12:22:59 2008
New Revision: 614974
URL: http://svn.apache.org/viewvc?rev=614974&view=rev
Log:
vote and implement
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=614974&r1=614973&r2=614974&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 24 12:22:59 2008
@@ -80,5 +80,5 @@
Otherwise it's only reachable in the HTMLManager.
http://people.apache.org/~rjung/patches/web_xml_expire.patch
(backport of r614933 from trunk)
- +1: rjung
+ +1: rjung, fhanik
-1:
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=614974&r1=614973&r2=614974&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Thu Jan 24 12:22:59 2008
@@ -751,7 +751,10 @@
NioEndpoint.KeyAttachment attach =
(NioEndpoint.KeyAttachment)socket.getAttachment(false);
if (attach != null) {
attach.setComet(comet);
- if (!comet) {
+ if (comet) {
+ Integer comettimeout = (Integer)
request.getAttribute("org.apache.tomcat.comet.timeout");
+ if (comettimeout != null)
attach.setTimeout(comettimeout.longValue());
+ } else {
//reset the timeout
attach.setTimeout(endpoint.getSocketProperties().getSoTimeout());
}
@@ -889,6 +892,10 @@
NioEndpoint.KeyAttachment attach =
(NioEndpoint.KeyAttachment) key.attachment();
if (attach != null) {
attach.setComet(comet);
+ if (comet) {
+ Integer comettimeout = (Integer)
request.getAttribute("org.apache.tomcat.comet.timeout");
+ if (comettimeout != null)
attach.setTimeout(comettimeout.longValue());
+ }
}
}
} catch (InterruptedIOException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
