Skip to content
Browse files

Indicate lack of support for ruby 1.9.0, indicate experimental suppor…

…t for ruby 1.9.1

git-svn-id: file:///home/svn/framework3/trunk@6661 4d416f70-5f16-0410-b530-b9f4589650da
  • Loading branch information...
1 parent 5757685 commit f78482d3f531b78c295b123f5f7152db3625fd7f HD Moore committed Jun 14, 2009
Showing with 11 additions and 7 deletions.
  1. +7 −3 lib/msf/sanity.rb
  2. +1 −1 lib/rex/post/meterpreter/packet_dispatcher.rb
  3. +1 −1 modules/encoders/x86/jmp_call_additive.rb
  4. +2 −2 msfencode
View
10 lib/msf/sanity.rb
@@ -23,10 +23,14 @@
end
# Check for ruby 1.9.0 and throw a big nasty warning
-if (RUBY_VERSION =~ /^1\.9\./)
- puts "*** Ruby 1.9.x is not currently supported, you may experience significant"
- puts " issues trying to use this version with the Metasploit Framework"
+if (RUBY_VERSION =~ /^1\.9\.0/)
+ puts "*** Ruby 1.9.0 is not supported, please upgrade to Ruby 1.9.1 or newer."
+ exit(0)
+end
+if(RUBY_VERSION =~ /^1\.9\./)
+ puts "*** Metasploit only has EXPERIMENTAL support for Ruby 1.9.1 and newer, things may break!"
+ puts "*** Please report bugs to msfdev[at]metasploit.com"
# Force binary encoding for Ruby versions that support it
if(Object.const_defined?('Encoding') and Encoding.respond_to?('default_external='))
View
2 lib/rex/post/meterpreter/packet_dispatcher.rb
@@ -265,4 +265,4 @@ def deregister_inbound_handler(handler)
attr_accessor :waiters # :nodoc:
end
-end; end; end
+end; end; end
View
2 modules/encoders/x86/jmp_call_additive.rb
@@ -120,4 +120,4 @@ def generate_decoder_stub(state)
Rex::Arch::X86::ESI ], nil, state.badchars)
end
-end
+end
View
4 msfencode
@@ -230,8 +230,8 @@ case cmd
exit
- rescue
- $stderr.puts(OutError + "#{enc.refname} failed: #{$!}")
+ rescue => e
+ $stderr.puts(OutError + "#{enc.refname} failed: #{e}")
end
}

0 comments on commit f78482d

Please sign in to comment.
Something went wrong with that request. Please try again.