From: Fredrik Tolf Date: Wed, 19 Dec 2012 05:24:35 +0000 (+0100) Subject: Merge branch 'master' into jython X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=809f0edc1d621010d0cf62ced892f13ee24fde8e;p=wrw.git Merge branch 'master' into jython Conflicts: wrw/req.py --- 809f0edc1d621010d0cf62ced892f13ee24fde8e diff --cc wrw/req.py index b65a0b9,5fbc2fe..fbe732b --- 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 = StringIO.StringIO("") + 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 = StringIO.StringIO("") + 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_":