Adjust for changes to medusa's asyncore.socket_map.

ZServer/FTPServer.py

@@ -586,7 +586,7 @@ class FTPLimiter:
         total=0
         class_total=0
         if channel.anonymous:
-            for existing_channel in asyncore.socket_map.keys():
+            for existing_channel in asyncore.socket_map.values():
                 if (hasattr(existing_channel,'server') and
                         existing_channel.server is channel.server):
                     total=total+1
@@ -595,7 +595,7 @@ class FTPLimiter:
             if class_total > self.anon_limit:
                 return None
         else:                
-            for existing_channel in asyncore.socket_map.keys():
+            for existing_channel in asyncore.socket_map.values():
                 if (hasattr(existing_channel,'server') and
                         existing_channel.server is channel.server):
                     total=total+1

ZServer/HTTPServer.py

@@ -364,7 +364,7 @@ class zhttp_channel(http_channel):
 
     def kill_zombies(self):
         now = int (time.time())
-        for channel in asyncore.socket_map.keys():
+        for channel in asyncore.socket_map.values():
             if channel.__class__ == self.__class__:
                 if (now - channel.creation_time) > channel.zombie_timeout:
                     channel.close()

lib/python/ZServer/FTPServer.py

@@ -586,7 +586,7 @@ class FTPLimiter:
         total=0
         class_total=0
         if channel.anonymous:
-            for existing_channel in asyncore.socket_map.keys():
+            for existing_channel in asyncore.socket_map.values():
                 if (hasattr(existing_channel,'server') and
                         existing_channel.server is channel.server):
                     total=total+1
@@ -595,7 +595,7 @@ class FTPLimiter:
             if class_total > self.anon_limit:
                 return None
         else:                
-            for existing_channel in asyncore.socket_map.keys():
+            for existing_channel in asyncore.socket_map.values():
                 if (hasattr(existing_channel,'server') and
                         existing_channel.server is channel.server):
                     total=total+1

lib/python/ZServer/HTTPServer.py

@@ -364,7 +364,7 @@ class zhttp_channel(http_channel):
 
     def kill_zombies(self):
         now = int (time.time())
-        for channel in asyncore.socket_map.keys():
+        for channel in asyncore.socket_map.values():
             if channel.__class__ == self.__class__:
                 if (now - channel.creation_time) > channel.zombie_timeout:
                     channel.close()