Merge branch 'landing-2967' into upstream-master

joevennix · joevennix · commit 1068fa0ad025 · 2014-02-10T11:05:04.000-06:00
Fixes regression in non-http TCP server modules.

e ignored, and an empty message aborts
diff --git a/lib/msf/core/exploit/tcp.rb b/lib/msf/core/exploit/tcp.rb
@@ -380,7 +380,7 @@ def start_service(*args)
         'LocalPort' => srvport,
         'SSL'       => ssl,
         'SSLCert'   => ssl_cert,
-        'SSLCompression' => opts['SSLCompression'] || ssl_compression,
+        'SSLCompression' => ssl_compression,
         'Comm'      => comm,
         'Context'   =>
           {

Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ def start_service(*args)`
`380`	`380`	`'LocalPort' => srvport,`
`381`	`381`	`'SSL' => ssl,`
`382`	`382`	`'SSLCert' => ssl_cert,`
`383`		`- 'SSLCompression' => opts['SSLCompression'] \|\| ssl_compression,`
	`383`	`+ 'SSLCompression' => ssl_compression,`
`384`	`384`	`'Comm' => comm,`
`385`	`385`	`'Context' =>`
`386`	`386`	`{`