pick OIDC_SET_COOKIE_APPEND over ext passed in to oidc_util_set_cookie

Signed-off-by: Hans Zandbelt <hans.zandbelt@zmartzone.eu>
OpenIDC · Jan 19, 2020 · 5aa7381 · 5aa7381
1 parent a326dbe
commit 5aa7381
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/util.c b/src/util.c
@@ -997,13 +997,12 @@ void oidc_util_set_cookie(request_rec *r, const char *cookieName,
 		headerString = apr_psprintf(r->pool, "%s; %s", headerString,
 				OIDC_COOKIE_FLAG_HTTP_ONLY);
 
-	if (ext != NULL)
-		headerString = apr_psprintf(r->pool, "%s; %s", headerString, ext);
-
 	appendString = oidc_util_set_cookie_append_value(r, c);
 	if (appendString != NULL)
 		headerString = apr_psprintf(r->pool, "%s; %s", headerString,
 				appendString);
+	else if (ext != NULL)
+		headerString = apr_psprintf(r->pool, "%s; %s", headerString, ext);
 
 	/* sanity check on overall cookie value size */
 	if (strlen(headerString) > OIDC_COOKIE_MAX_SIZE) {