From b9fd6e5c688abb03222d508b7c57d44b43d459c7 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Wed, 22 Aug 2012 08:40:55 -0500
Subject: [PATCH] simplied router logic, thanks Jonathan

---
 VERSION          |  2 +-
 gluon/rewrite.py | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/VERSION b/VERSION
index bc4cbff6..1307ed2d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-08-22 08:38:01) dev
+Version 2.00.0 (2012-08-22 08:40:52) dev
diff --git a/gluon/rewrite.py b/gluon/rewrite.py
index 72b7cb7f..14bb1dc6 100644
--- a/gluon/rewrite.py
+++ b/gluon/rewrite.py
@@ -823,21 +823,15 @@ class MapUrlIn(object):
         self.remote_addr = self.env.get('REMOTE_ADDR','localhost')
         self.scheme = self.env.get('wsgi.url_scheme', 'http').lower()
         self.method = self.env.get('REQUEST_METHOD', 'get').lower()
-        self.host = self.env.get('HTTP_HOST')
-        self.port = None
+        (self.host, self.port) = (self.env.get('HTTP_HOST'), None)
         if not self.host:
-            self.host = self.env.get('SERVER_NAME')
-            self.port = self.env.get('SERVER_PORT')
+            (self.host, self.port) = (self.env.get('SERVER_NAME'), self.env.get('SERVER_PORT'))
         if not self.host:
-            self.host = 'localhost'
-            self.port = '80'
+            (self.host, self.port) = ('localhost', '80')
         if ':' in self.host:
             (self.host, self.port) = self.host.split(':')
         if not self.port:
-            if self.scheme == 'https':
-                self.port = '443'
-            else:
-                self.port = '80'
+            self.port = '443' if self.scheme == 'https' else '80'
 
     def map_prefix(self):
         "strip path prefix, if present in its entirety"