From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 1 Mar 2021 20:13:54 +0000 (+0000)
Subject: mod_session: account for the '&' in identity_concat().
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1021
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e09dd714fc62c08c5b0319ed7b9702594faf49b;p=thirdparty%2Fapache%2Fhttpd.git

mod_session: account for the '&' in identity_concat().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1887052 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/changes-entries/session_parsing.txt b/changes-entries/session_parsing.txt
new file mode 100644
index 00000000000..a996e821063
--- /dev/null
+++ b/changes-entries/session_parsing.txt
@@ -0,0 +1,2 @@
+  *) mod_session: Improve session parsing.  [Yann Yalvic]
+
diff --git a/modules/session/mod_session.c b/modules/session/mod_session.c
index 01f41fe5d0f..a41e58444f9 100644
--- a/modules/session/mod_session.c
+++ b/modules/session/mod_session.c
@@ -326,7 +326,7 @@ static apr_status_t ap_session_set(request_rec * r, session_rec * z,
 static int identity_count(void *v, const char *key, const char *val)
 {
     int *count = v;
-    *count += strlen(key) * 3 + strlen(val) * 3 + 1;
+    *count += strlen(key) * 3 + strlen(val) * 3 + 2;
     return 1;
 }
 
@@ -362,7 +362,6 @@ static int identity_concat(void *v, const char *key, const char *val)
  */
 static apr_status_t session_identity_encode(request_rec * r, session_rec * z)
 {
-
     char *buffer = NULL;
     int length = 0;
     if (z->expiry) {