Fixes #5446 for real.
Breaks up the regex to more managable registers, ensures that nil is never returned.


git-svn-id: file:///home/svn/framework3/trunk@13729 4d416f70-5f16-0410-b530-b9f4589650da
unstable
Tod Beardsley 2011-09-14 16:41:30 +00:00
parent de98758f2b
commit b72ca9dcc8
1 changed files with 4 additions and 2 deletions

View File

@ -281,8 +281,10 @@ module Rex
# sometimes it's "URL encoded POST," and sometimes it might be something
# else.
def parse_method(meth)
real_method = meth.match(/^(\s*(GET|POST|PATH))|(\s+(GET|POST|PATH)\s*$)/)
real_method ? real_method[4] : "GET"
verbs = "(GET|POST|PATH)"
real_method = meth.match(/^\s*#{verbs}/)
real_method ||= meth.match(/\s*#{verbs}\s*$/)
( real_method && real_method[1] ) ? real_method[1] : "GET"
end
def report_host(&block)