@@ -1,5 +1,7 @@ == 1.2.1 Asynctilicious Ultra Supreme release - * Use Rails Rack based dispatcher when available in Rails 2.3 + * Require Rack 1.0.0 + * Require EventMachine 0.12.6 + * Use Rails Rack based dispatcher when available * Allow String for response body * Require openssl before eventmachine to prevent crash in 1.9 CHANGELOG @@ -12,7 +12,7 @@ module Thin CODENAME = "Asynctilicious Ultra Supreme".freeze - RACK = [0, 1].freeze # Rack protocol version that was tested + RACK = [1, 0].freeze # Rack protocol version end NAME = 'thin'.freeze lib/thin/version.rb @@ -5,13 +5,21 @@ describe Server, "stopping" do start_server do |env| [200, { 'Content-Type' => 'text/html' }, ['ok']] end + @done = false end it "should wait for current requests before soft stopping" do socket = TCPSocket.new('0.0.0.0', 3333) socket.write("GET / HTTP/1.1") - @server.stop # Stop the server in the middle of a request - socket.write("\r\n\r\n") + EventMachine.next_tick do + @server.stop # Stop the server in the middle of a request + socket.write("\r\n\r\n") + @done = true + end + + timeout(2) do + Thread.pass until @done + end out = socket.read socket.close @@ -36,7 +44,9 @@ describe Server, "stopping" do socket.write("GET / HTTP/1.1") @server.stop! # Force stop the server in the middle of a request - EventMachine.next_tick { socket.should be_closed } + EventMachine.next_tick do + socket.should be_closed + end end after do spec/server/stopping_spec.rb @@ -20,8 +20,8 @@ spec = Gem::Specification.new do |s| s.required_ruby_version = '>= 1.8.5' - s.add_dependency 'rack', '>= 0.9.1' - s.add_dependency 'eventmachine', '>= 0.12.4' + s.add_dependency 'rack', '>= 1.0.0' + s.add_dependency 'eventmachine', '>= 0.12.6' unless WIN s.add_dependency 'daemons', '>= 1.0.9' end tasks/gem.rake a303c274bbba38d46e6164672921b9610ec28c77 macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin/commit/ed2325ff41c187156abf17a61453653eadcaea98 ed2325ff41c187156abf17a61453653eadcaea98 2009-05-01T19:14:20-07:00 2009-05-01T19:14:20-07:00 * Require Rack 1.0.0 * Require EventMachine 0.12.6 f0f4108ed95be364d711c9aff557013cb2f2343f macournoyer macournoyer@gmail.com