You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by se...@apache.org on 2022/01/23 23:59:16 UTC
[incubator-ponymail-foal] branch master updated (0b7640a -> 30cc5c4)
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git.
from 0b7640a Use setup v2; try 3.10
new 35f3003 Simplify conditional
new 30cc5c4 Update version
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
server/plugins/session.py | 10 ++--------
server/server_version.py | 2 +-
2 files changed, 3 insertions(+), 9 deletions(-)
[incubator-ponymail-foal] 01/02: Simplify conditional
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 35f3003485347685dc161b935dead30c7716aa7f
Author: Sebb <se...@apache.org>
AuthorDate: Sun Jan 23 23:57:00 2022 +0000
Simplify conditional
---
server/plugins/session.py | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/server/plugins/session.py b/server/plugins/session.py
index ccb8ce7..433fd5b 100644
--- a/server/plugins/session.py
+++ b/server/plugins/session.py
@@ -117,10 +117,7 @@ async def get_session(
# In case the session is used twice within the same loop
session = copy.copy(x_session)
session.database = await server.dbpool.get()
- if "X-Forwarded-Host" in request.headers:
- session.host = request.headers["X-Forwarded-Host"]
- else:
- session.host = request.host
+ session.host = request.headers.get("X-Forwarded-Host", request.host)
session.remote = request.remote
# Do we need to update the timestamp in ES?
@@ -133,10 +130,7 @@ async def get_session(
# If not in local memory, start a new session object
session = SessionObject(server)
session.database = await server.dbpool.get()
- if "X-Forwarded-Host" in request.headers:
- session.host = request.headers["X-Forwarded-Host"]
- else:
- session.host = request.host or "??"
+ session.host = request.headers.get("X-Forwarded-Host", request.host or "??")
session.remote = request.remote or "??"
# If a cookie was supplied, look for a session object in ES
[incubator-ponymail-foal] 02/02: Update version
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 30cc5c4651c88e89000b7d2394a658d6cbf8b01c
Author: Sebb <se...@apache.org>
AuthorDate: Sun Jan 23 23:57:43 2022 +0000
Update version
---
server/server_version.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/server_version.py b/server/server_version.py
index 8743264..699f4b6 100644
--- a/server/server_version.py
+++ b/server/server_version.py
@@ -1,2 +1,2 @@
# This file is generated by server/update_version.sh
-PONYMAIL_SERVER_VERSION = '9410b08'
+PONYMAIL_SERVER_VERSION = '35f3003'