From 382c3c560f661df4fe9c1b31bb8d291721977949 Mon Sep 17 00:00:00 2001 From: Konstantin Haase Date: Sun, 11 Mar 2012 12:56:56 +0100 Subject: [PATCH] don't load broken backports on jruby, either --- lib/rack/utils.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/rack/utils.rb b/lib/rack/utils.rb index 2c449b0ae..365d059f0 100644 --- a/lib/rack/utils.rb +++ b/lib/rack/utils.rb @@ -5,10 +5,11 @@ require 'rack/multipart' major, minor, patch = RUBY_VERSION.split('.').map { |v| v.to_i } +ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby' if major == 1 && minor < 9 require 'rack/backports/uri/common_18' -elsif major == 1 && minor == 9 && patch == 2 && RUBY_PATCHLEVEL < 318 +elsif major == 1 && minor == 9 && patch == 2 && RUBY_PATCHLEVEL < 318 && RUBY_ENGINE != 'jruby' require 'rack/backports/uri/common_192' elsif major == 1 && minor == 9 && patch == 3 && RUBY_PATCHLEVEL < 125 require 'rack/backports/uri/common_193'