jruby isn't vulnerable

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@700 19e92222-5c0b-0410-8929-a290d50e31e9

5 files changed, 9 insertions, 33 deletions

diff --git a/projects/cgi_multipart_eof_fix/CHANGELOG b/projects/cgi_multipart_eof_fix/CHANGELOG
index f7e7dbc..0a11961 100644
--- a/projects/cgi_multipart_eof_fix/CHANGELOG
+++ b/projects/cgi_multipart_eof_fix/CHANGELOG
@@ -1,4 +1,6 @@
 
+v2.5.0. Not required for JRuby.
+
 v2.4.0. Signed gem.
 
 v2.3.0. Use STDERR, not $stderr, just like Mongrel; tests now use Test::Unit; moving to the mongrel project on RubyForge.
diff --git a/projects/cgi_multipart_eof_fix/Manifest b/projects/cgi_multipart_eof_fix/Manifest
index 4ef889d..b0004d6 100644
--- a/projects/cgi_multipart_eof_fix/Manifest
+++ b/projects/cgi_multipart_eof_fix/Manifest
@@ -1,7 +1,6 @@
-test/cgi_multipart_eof_fix_test.rb
-README
-Manifest
-LICENSE
-lib/rake_task_redefine_task.rb
-lib/cgi_multipart_eof_fix.rb
 CHANGELOG
+lib/cgi_multipart_eof_fix.rb
+LICENSE
+Manifest
+README
+test/test_cgi_multipart_eof_fix.rb
diff --git a/projects/cgi_multipart_eof_fix/lib/cgi_multipart_eof_fix.rb b/projects/cgi_multipart_eof_fix/lib/cgi_multipart_eof_fix.rb
index 4944005..a968594 100644
--- a/projects/cgi_multipart_eof_fix/lib/cgi_multipart_eof_fix.rb
+++ b/projects/cgi_multipart_eof_fix/lib/cgi_multipart_eof_fix.rb
@@ -5,7 +5,7 @@
 
 version = RUBY_VERSION.split(".").map {|i| i.to_i }
 
-if version [0] < 2 and version [1] < 9 and version [2] < 6
+if version [0] < 2 and version [1] < 9 and version [2] < 6 and RUBY_PLATFORM !~ /java/
 
   STDERR.puts "** Ruby version is not up-to-date; loading cgi_multipart_eof_fix"  
 
diff --git a/projects/cgi_multipart_eof_fix/lib/rake_task_redefine_task.rb b/projects/cgi_multipart_eof_fix/lib/rake_task_redefine_task.rb
deleted file mode 100644
index fce969e..0000000
--- a/projects/cgi_multipart_eof_fix/lib/rake_task_redefine_task.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-
-# http://www.bigbold.com/snippets/posts/show/2032
-module Rake
-  module TaskManager
-    def redefine_task(task_class, args, &block)
-      task_name, deps = resolve_args(args)
-      task_name = task_class.scope_name(@scope, task_name)
-      deps = [deps] unless deps.respond_to?(:to_ary)
-      deps = deps.collect {|d| d.to_s }
-      task = @tasks[task_name.to_s] = task_class.new(task_name, self)
-      task.application = self
-      task.add_comment(@last_comment)
-      @last_comment = nil
-      task.enhance(deps, &block)
-      task
-    end
-  end
-  class Task
-    class << self
-      def redefine_task(args, &block)
-        Rake.application.redefine_task(self, args, &block)
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/projects/cgi_multipart_eof_fix/test/cgi_multipart_eof_fix_test.rb b/projects/cgi_multipart_eof_fix/test/test_cgi_multipart_eof_fix.rb
index d85774a..fc2ac16 100755
--- a/projects/cgi_multipart_eof_fix/test/cgi_multipart_eof_fix_test.rb
+++ b/projects/cgi_multipart_eof_fix/test/test_cgi_multipart_eof_fix.rb
@@ -15,7 +15,7 @@ Object.send(:remove_const, :STDERR)
 STDERR = StringIO.new # hide the multipart load warnings
 
 version  = RUBY_VERSION.split(".").map {|i| i.to_i }
-IS_VULNERABLE = (version [0] < 2 and version [1] < 9 and version [2] < 6)
+IS_VULNERABLE = (version [0] < 2 and version [1] < 9 and version [2] < 6 and RUBY_PLATFORM !~ /java/)
 
 class CgiMultipartTestError < StandardError
 end