Merge 01e699a into 99aa512

celluloid · Aug 9, 2014 · dfa76f7 · dfa76f7
2 parents 99aa512 + 01e699a
commit dfa76f7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/lib/reel/server.rb b/lib/reel/server.rb
@@ -38,12 +38,6 @@ def run
       loop { async.handle_connection @server.accept }
     end
 
-    def optimize(socket)
-      if socket.is_a? TCPSocket
-        socket.setsockopt(Socket::IPPROTO_TCP, :TCP_NODELAY, 1)
-      end
-    end
-
     def handle_connection(socket)
       if @spy
         require 'reel/spy'

diff --git a/lib/reel/server/http.rb b/lib/reel/server/http.rb
@@ -10,7 +10,7 @@ class HTTP < Server
       #
       # @return [Reel::Server::HTTP] Reel HTTP server actor
       def initialize(host, port, options={}, &callback)
-        optimize server = Celluloid::IO::TCPServer.new(host, port)
+        server = Celluloid::IO::TCPServer.new(host, port)
         options.merge!(host: host, port: port)
         super(server, options, &callback)
       end

diff --git a/lib/reel/server/https.rb b/lib/reel/server/https.rb
@@ -38,7 +38,7 @@ def initialize(host, port, options={}, &callback)
           OpenSSL::SSL::VERIFY_NONE
         end
 
-        optimize @tcpserver = Celluloid::IO::TCPServer.new(host, port)
+        @tcpserver = Celluloid::IO::TCPServer.new(host, port)
 
         server = Celluloid::IO::SSLServer.new(@tcpserver, ssl_context)
         options.merge!(host: host, port: port)