Merge branch 'master' into python3

[wrw.git] / wrw / req.py

diff --git a/wrw/req.py b/wrw/req.py
index 41c5f16..0348c81 100644 (file)
--- a/wrw/req.py
+++ b/wrw/req.py
@@ -17,7 +17,7 @@ class headdict(object):
         del self.dict[key.lower()]
 
     def __iter__(self):
-        return iter((list[0] for list in self.dict.itervalues()))
+        return iter((list[0] for list in self.dict.values()))
     
     def get(self, key, default = ""):
         if key.lower() in self.dict:
@@ -70,6 +70,7 @@ class origrequest(request):
         self.query = env["QUERY_STRING"]
         self.remoteaddr = env["REMOTE_ADDR"]
         self.serverport = env["SERVER_PORT"]
+        self.servername = env["SERVER_NAME"]
         self.https = "HTTPS" in env
         self.ihead = headdict()
         self.ohead = headdict()