Changeset [231f251a7bdf19b6394801dce01ba57eedda3056] by raggi
Revision 231f251a7bdf19b6394801dce01ba57eedda3056,
committed by raggi
· August 21st, 2008 @ 12:02 PM
Merge commit 'origin/master' into async_for_rack
Conflicts:
lib/thin/connection.rb
43 changed files
-
M
CHANGELOG -
M
README -
M
example/adapter.rb -
M
example/config.ru -
M
lib/rack/adapter/loader.rb -
M
lib/rack/adapter/rails.rb -
M
lib/thin.rb -
M
lib/thin/backends/base.rb -
M
lib/thin/backends/unix_server.rb -
M
lib/thin/command.rb -
M
lib/thin/connection.rb -
M
lib/thin/controllers/controller.rb -
M
lib/thin/daemonizing.rb -
M
lib/thin/headers.rb -
M
lib/thin/logging.rb -
M
lib/thin/request.rb -
M
lib/thin/response.rb -
M
lib/thin/runner.rb -
M
lib/thin/server.rb -
M
lib/thin/stats.rb -
M
lib/thin/version.rb -
M
site/rdoc.rb -
M
site/thin.rb -
M
spec/backends/tcp_server_spec.rb -
M
spec/command_spec.rb -
M
spec/daemonizing_spec.rb -
M
spec/headers_spec.rb -
M
spec/logging_spec.rb -
M
spec/rack/rails_adapter_spec.rb -
M
spec/request/parser_spec.rb -
M
spec/response_spec.rb -
M
spec/runner_spec.rb -
M
spec/server/pipelining_spec.rb -
M
spec/server/robustness_spec.rb -
M
spec/server/stopping_spec.rb -
M
spec/server/swiftiply_spec.rb -
M
spec/server/tcp_spec.rb -
M
spec/server/threaded_spec.rb -
M
spec/server/unix_socket_spec.rb -
M
spec/spec_helper.rb -
M
tasks/announce.rake -
M
tasks/email.erb -
M
tasks/gem.rake