infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Land #3184, Rex::Proto::Http::Client IOError fix

bug/bundler_fix
William Vu 2014-04-03 15:58:50 -05:00
parent 03559dedcd 3504ddc633
commit 9779913060
No known key found for this signature in database
GPG Key ID: E761DCB4C1629024
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/rex/proto/http/client.rb
View File

@ -198,7 +198,7 @@ class Client
def close def close
if (self.conn) if (self.conn)
self.conn.shutdown self.conn.shutdown
self.conn.close self.conn.close unless self.conn.closed?
end end
self.conn = nil self.conn = nil

1
spec/lib/rex/proto/http/client_spec.rb
View File

@ -112,6 +112,7 @@ describe Rex::Proto::Http::Client do
conn.stub(:put) conn.stub(:put)
conn.stub(:shutdown) conn.stub(:shutdown)
conn.stub(:close) conn.stub(:close)
conn.stub(:closed? => false)
conn.should_receive(:get_once).and_return(first_response, authed_response) conn.should_receive(:get_once).and_return(first_response, authed_response)
conn.should_receive(:put) do |str_request| conn.should_receive(:put) do |str_request|