Indicate lack of support for ruby 1.9.0, indicate experimental support for ruby 1.9.1

git-svn-id: file:///home/svn/framework3/trunk@6661 4d416f70-5f16-0410-b530-b9f4589650da

lib/msf/sanity.rb

@@ -23,10 +23,14 @@ if (RUBY_VERSION =~ /^1\.[0-7]\./ or RUBY_VERSION =~ /^1\.8\.[0-1]$/)
 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='))

lib/rex/post/meterpreter/packet_dispatcher.rb

@@ -265,4 +265,4 @@ protected
 	attr_accessor :waiters # :nodoc:
 end
 
-end; end; end
+end; end; end

modules/encoders/x86/jmp_call_additive.rb

@@ -120,4 +120,4 @@ protected
 			Rex::Arch::X86::ESI ], nil, state.badchars)
 	end
 
-end
+end

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
 		}