[tor-commits] [flashproxy/master] Move a comment.

dcf at torproject.org dcf at torproject.org
Sun Oct 21 07:31:51 UTC 2012


commit 362a67a9e82a35f7822c628ce56ea4b364db2559
Author: David Fifield <david at bamsoftware.com>
Date:   Sun Oct 21 00:31:33 2012 -0700

    Move a comment.
---
 flashproxy-client |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/flashproxy-client b/flashproxy-client
index cc9d95a..088b8a7 100755
--- a/flashproxy-client
+++ b/flashproxy-client
@@ -461,13 +461,12 @@ def listen_socket(addr):
         # example, "::" will listen on both "::" and "0.0.0.0", and "::1" will
         # listen on both "::1" and "127.0.0.1". See
         # https://trac.torproject.org/projects/tor/ticket/4760.
-        # Python2.7.3 on Windows does not define IPPROTO_IPV6,
-        # see http://bugs.python.org/issue6926.
-        # Default behavior on Windows is to listen on IPv6 addresses only,
-        # so we can skip the setsockopt call.
         try:
             s.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 1)
         except AttributeError:
+            # Python 2.7.3 on Windows does not define IPPROTO_IPV6; see
+            # http://bugs.python.org/issue6926. IPV6_V6ONLY is the default
+            # behavior on Windows anyway, so we can skip the setsockopt.
             pass
     s.bind(addr)
     s.listen(10)



More information about the tor-commits mailing list