diff --git a/CHANGELOG b/CHANGELOG index 21650ad0..f552aa81 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,6 @@ == 1.3.0 Double Espresso + * BREAKING CHANGE: Thin no longer ships with fat Windows binaries. + From now on, to install on Windows, install https://github.com/oneclick/rubyinstaller/wiki/Development-Kit. * BREAKING CHANGE: Remove automatic Content-Length setting. It is now the responsibility of the app (or a middleware) to set the Content-Length. * Log errors to STDERR [textgoeshere] diff --git a/lib/thin.rb b/lib/thin.rb index 6711b7fc..bbac4831 100644 --- a/lib/thin.rb +++ b/lib/thin.rb @@ -38,15 +38,7 @@ module Controllers require "#{Thin::ROOT}/thin/version" require "#{Thin::ROOT}/thin/statuses" require "#{Thin::ROOT}/rack/adapter/loader" - -begin - # Select proper binary - major_ruby_version = RUBY_VERSION[/^(\d+\.\d+)/] - require "#{Thin::ROOT}/#{major_ruby_version}/thin_parser" -rescue LoadError - # Installed from source - require "#{Thin::ROOT}/thin_parser" -end +require "#{Thin::ROOT}/thin_parser" module Rack module Adapter