dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed some error in hashlib_md5

Browse Source
This commit is contained in:
mdipierro
2017-07-10 16:02:15 -05:00
parent ca1e5156ba
commit 047ed786ac
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/globals.py
+2 -2
View File
@@ -954,7 +954,7 @@ class Session(Storage):
cookie_expires.strftime(FMT) cookie_expires.strftime(FMT)
session_pickled = pickle.dumps(self, pickle.HIGHEST_PROTOCOL) session_pickled = pickle.dumps(self, pickle.HIGHEST_PROTOCOL)
response.session_hash = hashlib_md5(session_pickled).hexdigest() response.session_hash = hashlib.md5(session_pickled).hexdigest()
if self.flash: if self.flash:
(response.flash, self.flash) = (self.flash, None) (response.flash, self.flash) = (self.flash, None)
@@ -1141,7 +1141,7 @@ class Session(Storage):
return True return True
session_pickled = pickle.dumps(self, pickle.HIGHEST_PROTOCOL) session_pickled = pickle.dumps(self, pickle.HIGHEST_PROTOCOL)
response.session_pickled = session_pickled response.session_pickled = session_pickled
session_hash = hashlib_md5(session_pickled).hexdigest() session_hash = hashlib.md5(session_pickled).hexdigest()
return response.session_hash == session_hash return response.session_hash == session_hash
def _try_store_in_db(self, request, response): def _try_store_in_db(self, request, response):
gluon/rewrite.py
+1 -2
View File
@@ -206,8 +206,7 @@ def url_out(request, environ, application, controller, function,
if host is True or (host is None and (scheme or port is not None)): if host is True or (host is None and (scheme or port is not None)):
host = request.env.http_host host = request.env.http_host
if not scheme or scheme is True: if not scheme or scheme is True:
scheme = request.env.get('wsgi_url_scheme', 'http').lower() \ scheme = request.env.get('wsgi_url_scheme', 'http').lower() if request else 'http'
if request else 'http'
if host: if host:
host_port = host if not port else host.split(':', 1)[0] + ':%s' % port host_port = host if not port else host.split(':', 1)[0] + ':%s' % port
url = '%s://%s%s' % (scheme, host_port, url) url = '%s://%s%s' % (scheme, host_port, url)