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

better info to debug issue 921

Browse Source
This commit is contained in:
mdipierro
2012-08-08 09:35:01 -05:00
parent fdc895a1db
commit d7c00f2240
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-08-08 09:24:53) dev Version 2.00.0 (2012-08-08 09:34:59) dev
gluon/main.py
+2 -1
View File
@@ -405,7 +405,8 @@ def wsgibase(environ, responder):
except socket.gaierror: pass except socket.gaierror: pass
request.client = get_client(request.env) request.client = get_client(request.env)
if not is_valid_ip_address(request.client): if not is_valid_ip_address(request.client):
raise HTTP(400,"Bad Request") raise HTTP(400,"Bad Request (request.client=%s)" % \
request.client)
request.folder = abspath('applications', request.folder = abspath('applications',
request.application) + os.sep request.application) + os.sep
x_req_with = str(request.env.http_x_requested_with).lower() x_req_with = str(request.env.http_x_requested_with).lower()
gluon/utils.py
+4 -4
View File
@@ -157,14 +157,14 @@ def is_valid_ip_address(address):
True True
""" """
try: try:
if address.count('.')==3: if address.count('.')==3: # guess IPv4
addr = socket.inet_aton(address) addr = socket.inet_aton(address)
else: else: # guess IPv6
addr = socket.inet_pton(socket.AF_INET6, address) addr = socket.inet_pton(socket.AF_INET6, address)
except socket.error: # invalid address
return False
except AttributeError: # no socket.inet_pton except AttributeError: # no socket.inet_pton
return False return False
except socket.error:
return False
return True return True