Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
ffdeac3d
Commit
ffdeac3d
authored
Jun 05, 2013
by
Chris Dodge
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
seems like there's a Django bug and the SESSION_COOKIE_NAME needs to be an explicit str()
parent
6fb97d52
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
cms/envs/aws.py
+2
-1
lms/envs/aws.py
+2
-1
No files found.
cms/envs/aws.py
View file @
ffdeac3d
...
@@ -95,7 +95,8 @@ SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN')
...
@@ -95,7 +95,8 @@ SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN')
# this is to fix a bug regarding simultaneous logins between edx.org and edge.edx.org which can
# this is to fix a bug regarding simultaneous logins between edx.org and edge.edx.org which can
# happen with some browsers (e.g. Firefox)
# happen with some browsers (e.g. Firefox)
if
ENV_TOKENS
.
get
(
'SESSION_COOKIE_NAME'
,
None
):
if
ENV_TOKENS
.
get
(
'SESSION_COOKIE_NAME'
,
None
):
SESSION_COOKIE_NAME
=
ENV_TOKENS
.
get
(
'SESSION_COOKIE_NAME'
)
# NOTE, there's a bug in Django (http://bugs.python.org/issue18012) which necessitates this being a str()
SESSION_COOKIE_NAME
=
str
(
ENV_TOKENS
.
get
(
'SESSION_COOKIE_NAME'
))
#Email overrides
#Email overrides
DEFAULT_FROM_EMAIL
=
ENV_TOKENS
.
get
(
'DEFAULT_FROM_EMAIL'
,
DEFAULT_FROM_EMAIL
)
DEFAULT_FROM_EMAIL
=
ENV_TOKENS
.
get
(
'DEFAULT_FROM_EMAIL'
,
DEFAULT_FROM_EMAIL
)
...
...
lms/envs/aws.py
View file @
ffdeac3d
...
@@ -106,7 +106,8 @@ SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN')
...
@@ -106,7 +106,8 @@ SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN')
# this is to fix a bug regarding simultaneous logins between edx.org and edge.edx.org which can
# this is to fix a bug regarding simultaneous logins between edx.org and edge.edx.org which can
# happen with some browsers (e.g. Firefox)
# happen with some browsers (e.g. Firefox)
if
ENV_TOKENS
.
get
(
'SESSION_COOKIE_NAME'
,
None
):
if
ENV_TOKENS
.
get
(
'SESSION_COOKIE_NAME'
,
None
):
SESSION_COOKIE_NAME
=
ENV_TOKENS
.
get
(
'SESSION_COOKIE_NAME'
)
# NOTE, there's a bug in Django (http://bugs.python.org/issue18012) which necessitates this being a str()
SESSION_COOKIE_NAME
=
str
(
ENV_TOKENS
.
get
(
'SESSION_COOKIE_NAME'
))
BOOK_URL
=
ENV_TOKENS
[
'BOOK_URL'
]
BOOK_URL
=
ENV_TOKENS
[
'BOOK_URL'
]
MEDIA_URL
=
ENV_TOKENS
[
'MEDIA_URL'
]
MEDIA_URL
=
ENV_TOKENS
[
'MEDIA_URL'
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment