diff options
| -rw-r--r-- | VERSION.txt | 1 | ||||
| -rw-r--r-- | jetty-server/src/main/java/org/eclipse/jetty/server/nio/BlockingChannelConnector.java | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/VERSION.txt b/VERSION.txt index 7c603c98fb..f2a6ee4bbc 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -3,6 +3,7 @@ jetty-7.0.0.M2-SNAPSHOT + JETTY-959 CGI servlet doesn't kill the CGI in case the client disconnects + JETTY-996 Make start-stop-daemon optional + 273767 Update to use geronimo annotations spec 1.1.1 + + JETTY-1003 java.lang.IllegalArgumentException: timeout can't be negative jetty-7.0.0.M1 22 April 2009 + 271258 FORM Authentication dispatch handling avoids caching diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/nio/BlockingChannelConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/nio/BlockingChannelConnector.java index 393bfef14d..28a6aeb8a9 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/nio/BlockingChannelConnector.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/nio/BlockingChannelConnector.java @@ -152,9 +152,10 @@ public class BlockingChannelConnector extends AbstractNIOConnector { if (getServer().getThreadPool().isLowOnThreads()) { - if (_sotimeout!=getLowResourceMaxIdleTime()) + int lrmit = getLowResourceMaxIdleTime(); + if (lrmit>=0 && _sotimeout!= lrmit) { - _sotimeout=getLowResourceMaxIdleTime(); + _sotimeout=lrmit; ((SocketChannel)getTransport()).socket().setSoTimeout(_sotimeout); } } |