From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 19 Dec 2012 05:23:29 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=a02127330452ddc72406bb1e2e3eeadefe773ebb

Merge branch 'master' into python3

Conflicts:
	wrw/req.py
---

a02127330452ddc72406bb1e2e3eeadefe773ebb
diff --cc wrw/req.py
index 469c5b8,5fbc2fe..11f856c
--- a/wrw/req.py
+++ b/wrw/req.py
@@@ -140,15 -140,20 +140,20 @@@ class origrequest(request)
          self.servername = env["SERVER_NAME"]
          self.https = "HTTPS" in env
          self.ihead = headdict()
-         self.input = None
          if "CONTENT_TYPE" in env:
              self.ihead["Content-Type"] = env["CONTENT_TYPE"]
-         if "CONTENT_LENGTH" in env:
-             clen = self.ihead["Content-Length"] = env["CONTENT_LENGTH"]
-             if clen.isdigit():
-                 self.input = limitreader(env["wsgi.input"], int(clen))
-         if self.input is None:
-             self.input = io.BytesIO(b"")
+             if "CONTENT_LENGTH" in env:
+                 clen = self.ihead["Content-Length"] = env["CONTENT_LENGTH"]
+                 if clen.isdigit():
+                     self.input = limitreader(env["wsgi.input"], int(clen))
+                 else:
+                     # XXX: What to do?
 -                    self.input = io.BytesIO("")
++                    self.input = io.BytesIO(b"")
+             else:
+                 # Assume input is chunked and read until ordinary EOF.
+                 self.input = env["wsgi.input"]
+         else:
+             self.input = None
          self.ohead = headdict()
          for k, v in env.items():
              if k[:5] == "HTTP_":