X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Freq.py;h=41fd330c0a40a4734f7ffed0f549f9ad5c22b589;hb=7e9080af248b38edec371f117eb4749b09a3caca;hp=4b9dd7139dd6064d026bdbe2b88c8e0f6092be48;hpb=609f664f0fa5b4c94614a7c038be7238c719b2f2;p=wrw.git diff --git a/wrw/req.py b/wrw/req.py index 4b9dd71..41fd330 100644 --- a/wrw/req.py +++ b/wrw/req.py @@ -21,7 +21,7 @@ class headdict(object): def __iter__(self): return iter((list[0] for list in self.dict.itervalues())) - def get(self, key, default = ""): + def get(self, key, default=""): if key.lower() in self.dict: return self.dict[key.lower()][1] return default @@ -140,15 +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("") + 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("") + 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_":