Ticket #9857: 9857-2.patch

django/conf/global_settings.py

@@ -288 +288 @@
 # isExistingURL validator.
 from django import get_version
 URL_VALIDATOR_USER_AGENT = "Django/%s (http://www.djangoproject.com)" % get_version()
+URL_VERIFY_EXIST_SOCKET_TIMEOUT = 10
 
 # The tablespaces to use for each model when not specified otherwise.
 DEFAULT_TABLESPACE = ''

django/forms/fields.py

@@ -436 +436 @@
 try:
     from django.conf import settings
     URL_VALIDATOR_USER_AGENT = settings.URL_VALIDATOR_USER_AGENT
+    URL_VERIFY_EXIST_SOCKET_TIMEOUT = settings.URL_VERIFY_EXIST_SOCKET_TIMEOUT
 except ImportError:
     # It's OK if Django settings aren't configured.
     URL_VALIDATOR_USER_AGENT = 'Django (http://www.djangoproject.com/)'
+    URL_VERIFY_EXIST_SOCKET_TIMEOUT = 10
 
 
 class FileField(Field):
@@ -543 +545 @@
     default_error_messages = {
         'invalid': _(u'Enter a valid URL.'),
         'invalid_link': _(u'This URL appears to be a broken link.'),
+        'invalid_timeout': _(u'This URL took to long to respond, appears to be broken.'),
     }
 
     def __init__(self, max_length=None, min_length=None, verify_exists=False,
@@ -563 +566 @@
         if value == u'':
             return value
         if self.verify_exists:
+            import socket
             import urllib2
             headers = {
                 "Accept": "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5",
@@ -571 +575 @@
                 "Connection": "close",
                 "User-Agent": self.user_agent,
             }
+            socket_default_timeout = socket.getdefaulttimeout()
+            socket.setdefaulttimeout(URL_VERIFY_EXIST_SOCKET_TIMEOUT)
             try:
-                req = urllib2.Request(value, None, headers)
-                u = urllib2.urlopen(req)
-            except ValueError:
-                raise ValidationError(self.error_messages['invalid'])
-            except: # urllib2.URLError, httplib.InvalidURL, etc.
-                raise ValidationError(self.error_messages['invalid_link'])
+                try:
+                    req = urllib2.Request(value, None, headers)
+                    u = urllib2.urlopen(req)
+                except ValueError:
+                    raise ValidationError(self.error_messages['invalid'])
+                except Exception, e: # urllib2.URLError, httplib.InvalidURL, etc.
+                    if e.args and isinstance(e.args[0], socket.timeout):
+                        raise ValidationError(self.error_messages['invalid_timeout'])
+                    raise ValidationError(self.error_messages['invalid_link'])
+            finally:
+                socket.setdefaulttimeout(socket_default_timeout)
         return value
 
 class BooleanField(Field):