summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-05-09 15:42:14 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-05-09 15:42:14 +0200
commit3d595c3bc38cf939503b69ce7a2802d5663f85b9 (patch)
treec5dc588cda41a1d7e23743fd537ba74e5f151b3e /django
parentf25fc5b2209b9c53cc0a71880ab049816f3a66a1 (diff)
Fixed #20215 -- Disabled persistent connections by default.
Diffstat (limited to 'django')
-rw-r--r--django/db/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/utils.py b/django/db/utils.py
index 936b42039d..e84060f9b3 100644
--- a/django/db/utils.py
+++ b/django/db/utils.py
@@ -169,7 +169,7 @@ class ConnectionHandler(object):
conn.setdefault('ENGINE', 'django.db.backends.dummy')
if conn['ENGINE'] == 'django.db.backends.' or not conn['ENGINE']:
conn['ENGINE'] = 'django.db.backends.dummy'
- conn.setdefault('CONN_MAX_AGE', 600)
+ conn.setdefault('CONN_MAX_AGE', 0)
conn.setdefault('OPTIONS', {})
conn.setdefault('TIME_ZONE', 'UTC' if settings.USE_TZ else settings.TIME_ZONE)
for setting in ['NAME', 'USER', 'PASSWORD', 'HOST', 'PORT']: