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

simplied router logic, thanks Jonathan

Browse Source
This commit is contained in:
mdipierro
2012-08-22 08:40:55 -05:00
parent 68f2f0c400
commit b9fd6e5c68
2 changed files with 5 additions and 11 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-22 08:38:01) dev Version 2.00.0 (2012-08-22 08:40:52) dev
gluon/rewrite.py
+4 -10
View File
@@ -823,21 +823,15 @@ class MapUrlIn(object):
self.remote_addr = self.env.get('REMOTE_ADDR','localhost') self.remote_addr = self.env.get('REMOTE_ADDR','localhost')
self.scheme = self.env.get('wsgi.url_scheme', 'http').lower() self.scheme = self.env.get('wsgi.url_scheme', 'http').lower()
self.method = self.env.get('REQUEST_METHOD', 'get').lower() self.method = self.env.get('REQUEST_METHOD', 'get').lower()
self.host = self.env.get('HTTP_HOST') (self.host, self.port) = (self.env.get('HTTP_HOST'), None)
self.port = None
if not self.host: if not self.host:
self.host = self.env.get('SERVER_NAME') (self.host, self.port) = (self.env.get('SERVER_NAME'), self.env.get('SERVER_PORT'))
self.port = self.env.get('SERVER_PORT')
if not self.host: if not self.host:
self.host = 'localhost' (self.host, self.port) = ('localhost', '80')
self.port = '80'
if ':' in self.host: if ':' in self.host:
(self.host, self.port) = self.host.split(':') (self.host, self.port) = self.host.split(':')
if not self.port: if not self.port:
if self.scheme == 'https': self.port = '443' if self.scheme == 'https' else '80'
self.port = '443'
else:
self.port = '80'
def map_prefix(self): def map_prefix(self):
"strip path prefix, if present in its entirety" "strip path prefix, if present in its entirety"