X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Freq.py;h=0348c8107d2d8fccd348469cba7a305aae3527cc;hb=920b69c320cb0dc83eec0c8b4397c7a5b80b7d5b;hp=90cfbaa8e0f6327edf7445c03dc471b1afe52f38;hpb=48d3b07a5a72f32d44c36ffba567227ae3bf2401;p=wrw.git

diff --git a/wrw/req.py b/wrw/req.py
index 90cfbaa..0348c81 100644
--- 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:
@@ -62,7 +62,7 @@ class request(object):
 class origrequest(request):
     def __init__(self, env):
         self.env = env
-        self.method = env["REQUEST_METHOD"]
+        self.method = env["REQUEST_METHOD"].upper()
         self.uriname = env["SCRIPT_NAME"]
         self.filename = env.get("SCRIPT_FILENAME")
         self.uri = env["REQUEST_URI"]
@@ -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()
@@ -137,6 +138,7 @@ class copyrequest(request):
         self.parent = p
         self.top = p.topreq()
         self.env = p.env
+        self.method = p.method
         self.uriname = p.uriname
         self.filename = p.filename
         self.uri = p.uri