@@ -1,4 +1,5 @@ == 0.7.1 Fancy Pants release + * Ruby 1.8.5 compatibility, closes #49 [Wincent Colaiuta] * Move all EventMachine stuff out of Server, you can now create a Thin Backend that does not depend on EventMachine. * Rename Connector to Backend. Extend Thin::Backends::Base to implement your own. CHANGELOG @@ -87,6 +87,8 @@ module Thin else Backends::TcpServer.new(host_or_socket_or_backend, port.to_i) end + + load_cgi_multipart_eof_fix @app = app @backend.server = self @@ -186,6 +188,20 @@ module Thin trap('QUIT') { stop } unless Thin.win? trap('INT') { stop! } trap('TERM') { stop! } - end + end + + # Taken from Mongrel cgi_multipart_eof_fix + def load_cgi_multipart_eof_fix + version = RUBY_VERSION.split('.').map { |i| i.to_i } + + if version[0] <= 1 && version[1] <= 8 && version[2] <= 5 && RUBY_PLATFORM !~ /java/ + begin + require 'cgi_multipart_eof_fix' + rescue LoadError + log "!! Ruby 1.8.5 is not secure please install cgi_multipart_eof_fix:" + log " gem install cgi_multipart_eof_fix" + end + end + end end end \ No newline at end of file lib/thin/server.rb 3380e9a2bdafb94b75b766255e4cd00fb4eb0046 macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin/commit/4c30c781a26b14bd7038646a6c258f57cb91c1f3 4c30c781a26b14bd7038646a6c258f57cb91c1f3 2008-03-02T11:32:21-08:00 2008-03-02T11:32:21-08:00 Load cgi_multipart_eof_fix if Ruby 1.8.5, closes #49 8d363642dfc6baf12dd4273676e62c684b26c098 macournoyer macournoyer@gmail.com