summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/net/http.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d0689e0da3..90dea209df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 25 17:53:18 2013 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/net/http.rb (Net::HTTP#connect): disable Nagle's algorithm on
+ HTTP connection. [ruby-core:56158] [Feature #8681]
+
Thu Jul 25 17:49:42 2013 NARUSE, Yui <naruse@ruby-lang.org>
* re.c (rb_reg_to_s): convert closing parenthes to the target encoding
diff --git a/lib/net/http.rb b/lib/net/http.rb
index a383ff617f..a179dcf348 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -877,6 +877,7 @@ module Net #:nodoc:
s = Timeout.timeout(@open_timeout, Net::OpenTimeout) {
TCPSocket.open(conn_address, conn_port, @local_host, @local_port)
}
+ s.setsockopt(IPPROTO_TCP, TCP_NODELAY, 1)
D "opened"
if use_ssl?
ssl_parameters = Hash.new