Merge branch 'master' into python3

diff --combined wrw/req.py
index 0348c81,4f93eb9..f703e0f
--- 1/wrw/req.py
--- 2/wrw/req.py
+++ b/wrw/req.py
@@@ -17,7 -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:
@@@ -73,6 -73,10 +73,10 @@@ class origrequest(request)
          self.servername = env["SERVER_NAME"]
          self.https = "HTTPS" in env
          self.ihead = headdict()
+         if "CONTENT_TYPE" in env:
+             self.ihead["Content-Type"] = env["CONTENT_TYPE"]
+         if "CONTENT_LENGTH" in env:
+             self.ihead["Content-Length"] = env["CONTENT_LENGTH"]
          self.ohead = headdict()
          for k, v in env.items():
              if k[:5] == "HTTP_":