Merge branch 'landing-2967' into upstream-master

Fixes regression in non-http TCP server modules. e ignored, and an empty message aborts
2014-02-10 11:05:04 -06:00 · 2014-02-10 11:05:04 -06:00 · 1068fa0ad0
parent 5672a4dae5 fab8e16a87
commit 1068fa0ad0
1 changed files with 1 additions and 1 deletions
--- a/lib/msf/core/exploit/tcp.rb
+++ b/lib/msf/core/exploit/tcp.rb
@ -380,7 +380,7 @@ module Exploit::Remote::TcpServer
        'LocalPort' => srvport,
        'SSL'       => ssl,
        'SSLCert'   => ssl_cert,
-        'SSLCompression' => opts['SSLCompression'] || ssl_compression,
+        'SSLCompression' => ssl_compression,
        'Comm'      => comm,
        'Context'   =>
          {