Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JETTY-1249 Apply max idle time 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2107 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2010-07-12 11:15:43 +00:00
parent aa9df8b65d
commit 7540debfe7
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VERSION.txt
View File

@ -1,6 +1,7 @@
jetty-7.2-SNAPSHOT jetty-7.2-SNAPSHOT
+ 319334 Concurrent, sharable ResourceCache + 319334 Concurrent, sharable ResourceCache
+ 319370 WebAppClassLoader.Context + 319370 WebAppClassLoader.Context
+ JETTY-1249 Apply max idle time
+ Added ignore to Logger interface + Added ignore to Logger interface
jetty-7.1.5.v20100705 jetty-7.1.5.v20100705

1
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
View File

@ -26,7 +26,6 @@ import org.eclipse.jetty.io.Connection;
import org.eclipse.jetty.io.EofException; import org.eclipse.jetty.io.EofException;
import org.eclipse.jetty.io.nio.SelectorManager.SelectSet; import org.eclipse.jetty.io.nio.SelectorManager.SelectSet;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.thread.Timeout;
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
/** /**

4
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ProxyHandler.java
View File

@ -421,7 +421,9 @@ public class ProxyHandler extends HandlerWrapper
@Override @Override
protected SelectChannelEndPoint newEndPoint(SocketChannel channel, SelectSet selectSet, SelectionKey selectionKey) throws IOException protected SelectChannelEndPoint newEndPoint(SocketChannel channel, SelectSet selectSet, SelectionKey selectionKey) throws IOException
{ {
return new SelectChannelEndPoint(channel, selectSet, selectionKey); SelectChannelEndPoint endp = new SelectChannelEndPoint(channel, selectSet, selectionKey);
// TODO endp.setMaxIdleTime(_writeTimeout);
return endp;
} }
@Override @Override

1
jetty-server/src/main/java/org/eclipse/jetty/server/nio/SelectChannelConnector.java
View File

@ -164,6 +164,7 @@ public class SelectChannelConnector extends AbstractNIOConnector
SelectChannelEndPoint cep = ((SelectChannelEndPoint)endpoint); SelectChannelEndPoint cep = ((SelectChannelEndPoint)endpoint);
cep.cancelIdle(); cep.cancelIdle();
request.setTimeStamp(cep.getSelectSet().getNow()); request.setTimeStamp(cep.getSelectSet().getNow());
endpoint.setMaxIdleTime(_maxIdleTime);
super.customize(endpoint, request); super.customize(endpoint, request);
} }