minor update

This commit is contained in:
Miroslav Stampar 2012-02-08 14:23:57 +00:00
parent 1d4b10dbd1
commit 7e9e582eca
2 changed files with 2 additions and 3 deletions

View File

@ -1292,9 +1292,6 @@ def parseTargetUrl():
else: else:
conf.port = 80 conf.port = 80
if conf.forceSSL and conf.port == 80:
conf.port = 443
if __urlSplit[3]: if __urlSplit[3]:
conf.parameters[PLACE.GET] = urldecode(__urlSplit[3]) if __urlSplit[3] and urlencode(DEFAULT_GET_POST_DELIMITER, None) not in __urlSplit[3] else __urlSplit[3] conf.parameters[PLACE.GET] = urldecode(__urlSplit[3]) if __urlSplit[3] and urlencode(DEFAULT_GET_POST_DELIMITER, None) not in __urlSplit[3] else __urlSplit[3]

View File

@ -295,6 +295,8 @@ def __feedTargetsDict(reqFile, addedTargetUrls):
conf.httpHeaders.append((str(key), str(value))) conf.httpHeaders.append((str(key), str(value)))
if getPostReq and (params or cookie): if getPostReq and (params or cookie):
if conf.forceSSL:
scheme = "https"
if not port and isinstance(scheme, basestring) and scheme.lower() == "https": if not port and isinstance(scheme, basestring) and scheme.lower() == "https":
port = "443" port = "443"
elif not scheme and port == "443": elif not scheme and port == "443":