From eb359c7f850eeddd2552a75ac148fd78a0eddf02 Mon Sep 17 00:00:00 2001
From: Ryan Williams <rdw@lindenlab.com>
Date: Sat, 28 Nov 2009 15:41:10 -0500
Subject: [PATCH] Fixed minor compatibility issue with 2.6 relating to the
 weird _GLOBAL_DEFAULT_TIMEOUT value.

---
 eventlet/greenio.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/eventlet/greenio.py b/eventlet/greenio.py
index b1d2e1b..9e0ec06 100644
--- a/eventlet/greenio.py
+++ b/eventlet/greenio.py
@@ -152,6 +152,12 @@ def set_nonblocking(fd):
         setblocking(0)
 
 
+try:
+    from socket import _GLOBAL_DEFAULT_TIMEOUT
+except ImportError:
+    _GLOBAL_DEFAULT_TIMEOUT = object()
+    
+
 class GreenSocket(object):
     timeout = None
     def __init__(self, family_or_realsock=socket.AF_INET, *args, **kwargs):
@@ -337,7 +343,7 @@ class GreenSocket(object):
         return fn(*args, **kw)
 
     def settimeout(self, howlong):
-        if howlong is None:
+        if howlong is None or howlong == _GLOBAL_DEFAULT_TIMEOUT:
             self.setblocking(True)
             return
         try: