From 8a876a5ec3b7b2853ade6369e16bd94f857e1c73 Mon Sep 17 00:00:00 2001
From: Jesse Zoldak <zoldak@edx.org>
Date: Wed, 16 Sep 2015 14:27:16 -0400
Subject: [PATCH] Add the ability to change the SESSION_SAVE_EVERY_REQUEST
 django setting

---
 cms/envs/aws.py    | 1 +
 cms/envs/common.py | 1 +
 lms/envs/aws.py    | 4 +++-
 lms/envs/common.py | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cms/envs/aws.py b/cms/envs/aws.py
index 84d8947fbf..0eed135a20 100644
--- a/cms/envs/aws.py
+++ b/cms/envs/aws.py
@@ -145,6 +145,7 @@ SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN')
 SESSION_COOKIE_HTTPONLY = ENV_TOKENS.get('SESSION_COOKIE_HTTPONLY', True)
 SESSION_ENGINE = ENV_TOKENS.get('SESSION_ENGINE', SESSION_ENGINE)
 SESSION_COOKIE_SECURE = ENV_TOKENS.get('SESSION_COOKIE_SECURE', SESSION_COOKIE_SECURE)
+SESSION_SAVE_EVERY_REQUEST = ENV_TOKENS.get('SESSION_SAVE_EVERY_REQUEST', SESSION_SAVE_EVERY_REQUEST)
 
 # allow for environments to specify what cookie name our login subsystem should use
 # this is to fix a bug regarding simultaneous logins between edx.org and edge.edx.org which can
diff --git a/cms/envs/common.py b/cms/envs/common.py
index f1d34953a1..a9e71b4376 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -390,6 +390,7 @@ MODULESTORE = {
 DEBUG = False
 TEMPLATE_DEBUG = False
 SESSION_COOKIE_SECURE = False
+SESSION_SAVE_EVERY_REQUEST = False
 
 # Site info
 SITE_ID = 1
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 3566c13970..2d55f787b4 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -157,8 +157,10 @@ HTTPS = ENV_TOKENS.get('HTTPS', HTTPS)
 SESSION_ENGINE = ENV_TOKENS.get('SESSION_ENGINE', SESSION_ENGINE)
 SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN')
 SESSION_COOKIE_HTTPONLY = ENV_TOKENS.get('SESSION_COOKIE_HTTPONLY', True)
-REGISTRATION_EXTRA_FIELDS = ENV_TOKENS.get('REGISTRATION_EXTRA_FIELDS', REGISTRATION_EXTRA_FIELDS)
 SESSION_COOKIE_SECURE = ENV_TOKENS.get('SESSION_COOKIE_SECURE', SESSION_COOKIE_SECURE)
+SESSION_SAVE_EVERY_REQUEST = ENV_TOKENS.get('SESSION_SAVE_EVERY_REQUEST', SESSION_SAVE_EVERY_REQUEST)
+
+REGISTRATION_EXTRA_FIELDS = ENV_TOKENS.get('REGISTRATION_EXTRA_FIELDS', REGISTRATION_EXTRA_FIELDS)
 
 # Set the names of cookies shared with the marketing site
 # These have the same cookie domain as the session, which in production
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 41924c2217..b34f4d0175 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -801,6 +801,7 @@ DEBUG = False
 TEMPLATE_DEBUG = False
 USE_TZ = True
 SESSION_COOKIE_SECURE = False
+SESSION_SAVE_EVERY_REQUEST = False
 
 # CMS base
 CMS_BASE = 'localhost:8001'