Commit bf2d7fb1 authored by Jim Fulton's avatar Jim Fulton

Bug fixed

- Changes to suppprt IPv6 broke a fix for a problem on Mac OS X that
  could cause a server to stop accepting connections.
parent ddd6d286
...@@ -19,6 +19,9 @@ Bugs fixed ...@@ -19,6 +19,9 @@ Bugs fixed
- When mulri-database connections were no longer used and cleaned up, - When mulri-database connections were no longer used and cleaned up,
their subconnections weren't cleaned up properly. their subconnections weren't cleaned up properly.
- Changes to suppprt IPv6 broke a fix for a problem on Mac OS X that
could cause a server to stop accepting connections.
3.10.0b7 (2010-09-28) 3.10.0b7 (2010-09-28)
===================== =====================
......
...@@ -87,8 +87,6 @@ class Dispatcher(asyncore.dispatcher): ...@@ -87,8 +87,6 @@ class Dispatcher(asyncore.dispatcher):
log("accepted failed: %s" % msg) log("accepted failed: %s" % msg)
return return
# Drop flow-info from IPv6 addresses
addr = addr[:2]
# We could short-circuit the attempt below in some edge cases # We could short-circuit the attempt below in some edge cases
# and avoid a log message by checking for addr being None. # and avoid a log message by checking for addr being None.
...@@ -101,6 +99,10 @@ class Dispatcher(asyncore.dispatcher): ...@@ -101,6 +99,10 @@ class Dispatcher(asyncore.dispatcher):
# It might be better to check whether the socket has been # It might be better to check whether the socket has been
# closed, but I don't see a way to do that. :( # closed, but I don't see a way to do that. :(
# Drop flow-info from IPv6 addresses
if addr: # Sometimes None on Mac. See above.
addr = addr[:2]
try: try:
c = self.factory(sock, addr) c = self.factory(sock, addr)
except: except:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment