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

diff --git a/wrw/req.py b/wrw/req.py
index 90cfbaa..fbe732b 100644
--- a/wrw/req.py
+++ b/wrw/req.py
@@ -1,3 +1,5 @@
+import StringIO
+
 __all__ = ["request"]
 
 class headdict(object):
@@ -49,6 +51,71 @@ def fixcase(str):
         i += 1
     return str
 
+class limitreader(object):
+    def __init__(self, back, limit):
+        self.bk = back
+        self.limit = limit
+        self.rb = 0
+        self.buf = ""
+
+    def close(self):
+        pass
+
+    def read(self, size=-1):
+        ra = self.limit - self.rb
+        if size >= 0:
+            ra = min(ra, size)
+        while len(self.buf) < ra:
+            ret = self.bk.read(ra - len(self.buf))
+            if ret == "":
+                raise IOError("Unexpected EOF")
+            self.buf += ret
+            self.rb += len(ret)
+        ret = self.buf[:ra]
+        self.buf = self.buf[ra:]
+        return ret
+
+    def readline(self, size=-1):
+        off = 0
+        while True:
+            p = self.buf.find('\n', off)
+            if p >= 0:
+                ret = self.buf[:p + 1]
+                self.buf = self.buf[p + 1:]
+                return ret
+            off = len(self.buf)
+            if size >= 0 and len(self.buf) >= size:
+                ret = self.buf[:size]
+                self.buf = self.buf[size:]
+                return ret
+            if self.rb == self.limit:
+                ret = self.buf
+                self.buf = ""
+                return ret
+            ra = self.limit - self.rb
+            if size >= 0:
+                ra = min(ra, size)
+            ra = min(ra, 1024)
+            ret = self.bk.read(ra)
+            if ret == "":
+                raise IOError("Unpexpected EOF")
+            self.buf += ret
+            self.rb += len(ret)
+
+    def readlines(self, hint=None):
+        return list(self)
+
+    def __iter__(rd):
+        class lineiter(object):
+            def __iter__(self):
+                return self
+            def next(self):
+                ret = rd.readline()
+                if ret == "":
+                    raise StopIteration()
+                return ret
+        return lineiter()
+
 class request(object):
     def copy(self):
         return copyrequest(self)
@@ -62,7 +129,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,8 +137,23 @@ 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()
+        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))
+                else:
+                    # XXX: What to do?
+                    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_":
@@ -137,6 +219,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