--- a/jdk/src/share/classes/sun/net/httpserver/ServerImpl.java Wed Jul 20 12:19:41 2011 -0700
+++ b/jdk/src/share/classes/sun/net/httpserver/ServerImpl.java Thu Jul 21 17:28:10 2011 +0100
@@ -27,8 +27,6 @@
import java.net.*;
import java.io.*;
-import java.nio.*;
-import java.security.*;
import java.nio.channels.*;
import java.util.*;
import java.util.concurrent.*;
@@ -36,7 +34,6 @@
import java.util.logging.Level;
import javax.net.ssl.*;
import com.sun.net.httpserver.*;
-import com.sun.net.httpserver.spi.*;
import sun.net.httpserver.HttpConnection.State;
/**
@@ -358,6 +355,12 @@
continue;
}
SocketChannel chan = schan.accept();
+
+ // Set TCP_NODELAY, if appropriate
+ if (ServerConfig.noDelay()) {
+ chan.socket().setTcpNoDelay(true);
+ }
+
if (chan == null) {
continue; /* cancel something ? */
}