See #434. Fixes up the last of the modules using the wrong Timeout exception class
git-svn-id: file:///home/svn/framework3/trunk@7326 4d416f70-5f16-0410-b530-b9f4589650daunstable
parent
1b5cc24eab
commit
ac14e84eb6
|
@ -203,7 +203,7 @@ class Metasploit3 < Msf::Auxiliary
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
rescue Timeout::TimeoutError
|
rescue Timeout::Error
|
||||||
end
|
end
|
||||||
|
|
||||||
return reply
|
return reply
|
||||||
|
|
|
@ -146,7 +146,7 @@ class Metasploit3 < Msf::Auxiliary
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
rescue Timeout::TimeoutError
|
rescue Timeout::Error
|
||||||
end
|
end
|
||||||
|
|
||||||
return reply
|
return reply
|
||||||
|
|
|
@ -147,7 +147,7 @@ class Metasploit3 < Msf::Auxiliary
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
rescue Timeout::TimeoutError
|
rescue Timeout::Error
|
||||||
end
|
end
|
||||||
|
|
||||||
return reply
|
return reply
|
||||||
|
|
|
@ -147,7 +147,7 @@ class Metasploit3 < Msf::Auxiliary
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
rescue Timeout::TimeoutError
|
rescue Timeout::Error
|
||||||
end
|
end
|
||||||
|
|
||||||
return reply
|
return reply
|
||||||
|
|
|
@ -187,7 +187,7 @@ class Metasploit3 < Msf::Exploit::Remote
|
||||||
session.close
|
session.close
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
rescue ::TimeoutError
|
rescue ::Timeout::Error
|
||||||
print_status("Timed out waiting on the HTTP request")
|
print_status("Timed out waiting on the HTTP request")
|
||||||
wdmserver.close
|
wdmserver.close
|
||||||
disconnect()
|
disconnect()
|
||||||
|
|
Loading…
Reference in New Issue