Changeset 1571

Timestamp:

12/28/06 14:01:51

Author:

fumanchu

Message:

2.x backport of [1533] (Fixed serious buglet in SizeCheckWrapper? which allowed unmonitored read.)

Files:

• branches/cherrypy-2.x/cherrypy/_cpwsgiserver.py (modified) (1 diff)
• branches/cherrypy-2.x/cherrypy/lib/httptools.py (modified) (2 diffs)

branches/cherrypy-2.x/cherrypy/_cpwsgiserver.py

@@ -324 +324 @@
-            # Get the correct address family for our host (allows IPv6 addresses)
-            host, port = self.bind_addr
+            flags = 0
+            if host == '':
+                # Despite the socket module docs, using '' does not
+                # allow AI_PASSIVE to work. Passing None instead
+                # returns '0.0.0.0' like we want.
+                host = None
+                flags = socket.AI_PASSIVE
-            try:
-                info = socket.getaddrinfo(host, port, socket.AF_UNSPEC,
-
+, 0, flags
-            except socket.gaierror:
-                # Probably a DNS issue. Assume IPv4.

branches/cherrypy-2.x/cherrypy/lib/httptools.py

@@ -561 +561 @@
-    
-    def __iter__(self):
-.rfile
+
-    
-    def next(self):
@@ -567 +567 @@
-        self.bytes_read += len(data)
-        self._check_length()
-##      Normally the next method must raise StopIteration when it
-##      fails but CP expects MaxSizeExceeded 
-##        try:
-##            self._check_length()
-##        except:
-##            raise StopIteration()
-        return data
-