|
 |
79aa81 |
From 914f700cd791d370cf363d408e938598023980dc Mon Sep 17 00:00:00 2001
|
|
|
79aa81 |
From: Hans Zandbelt <hans.zandbelt@zmartzone.eu>
|
|
|
79aa81 |
Date: Sun, 19 Jan 2020 16:00:31 +0100
|
|
|
79aa81 |
Subject: [PATCH 15/19] pick OIDC_SET_COOKIE_APPEND over ext passed in to
|
|
|
79aa81 |
oidc_util_set_cookie
|
|
|
79aa81 |
|
|
|
79aa81 |
Signed-off-by: Hans Zandbelt <hans.zandbelt@zmartzone.eu>
|
|
|
79aa81 |
(cherry picked from commit 5aa73817172acbb9e86287a54bc4532af7e394ee)
|
|
|
79aa81 |
---
|
|
|
79aa81 |
src/util.c | 5 ++---
|
|
|
79aa81 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
79aa81 |
|
|
|
79aa81 |
diff --git a/src/util.c b/src/util.c
|
|
|
79aa81 |
index 993718e..c1fa5f3 100644
|
|
|
79aa81 |
--- a/src/util.c
|
|
|
79aa81 |
+++ b/src/util.c
|
|
|
79aa81 |
@@ -980,13 +980,12 @@ void oidc_util_set_cookie(request_rec *r, const char *cookieName,
|
|
|
79aa81 |
headerString = apr_psprintf(r->pool, "%s; %s", headerString,
|
|
|
79aa81 |
OIDC_COOKIE_FLAG_HTTP_ONLY);
|
|
|
79aa81 |
|
|
|
79aa81 |
- if (ext != NULL)
|
|
|
79aa81 |
- headerString = apr_psprintf(r->pool, "%s; %s", headerString, ext);
|
|
|
79aa81 |
-
|
|
|
79aa81 |
appendString = oidc_util_set_cookie_append_value(r, c);
|
|
|
79aa81 |
if (appendString != NULL)
|
|
|
79aa81 |
headerString = apr_psprintf(r->pool, "%s; %s", headerString,
|
|
|
79aa81 |
appendString);
|
|
|
79aa81 |
+ else if (ext != NULL)
|
|
|
79aa81 |
+ headerString = apr_psprintf(r->pool, "%s; %s", headerString, ext);
|
|
|
79aa81 |
|
|
|
79aa81 |
/* sanity check on overall cookie value size */
|
|
|
79aa81 |
if (strlen(headerString) > OIDC_COOKIE_MAX_SIZE) {
|
|
|
79aa81 |
--
|
|
|
79aa81 |
2.26.2
|
|
|
79aa81 |
|