Ticket #8509: testcookie_fix.diff

django/contrib/admin/sites.py

@@ -275 +275 @@
                 login(request, user)
                 if request.POST.has_key('post_data'):
                     post_data = _decode_post_data(request.POST['post_data'])
-                    request.session.delete_test_cookie()
+                    if request.session.test_cookie_worked():
+                        request.session.delete_test_cookie()
                     if post_data and not post_data.has_key(LOGIN_FORM_KEY):
                         # overwrite request.POST with the saved post_data, and continue
                         request.POST = post_data