svn commit: r1887052 - in /httpd/httpd/trunk: changes-entries/session_parsing.txt modules/session/mod_session.c

[yl...@apache.org]

Author: ylavic
Date: Mon Mar  1 20:13:54 2021
New Revision: 1887052

URL: http://svn.apache.org/viewvc?rev=1887052&view=rev
Log:
mod_session: account for the '&' in identity_concat().

Added:
    httpd/httpd/trunk/changes-entries/session_parsing.txt
Modified:
    httpd/httpd/trunk/modules/session/mod_session.c

Added: httpd/httpd/trunk/changes-entries/session_parsing.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/changes-entries/session_parsing.txt?rev=1887052&view=auto
==============================================================================
--- httpd/httpd/trunk/changes-entries/session_parsing.txt (added)
+++ httpd/httpd/trunk/changes-entries/session_parsing.txt Mon Mar  1 20:13:54 2021
@@ -0,0 +1,2 @@
+  *) mod_session: Improve session parsing.  [Yann Yalvic]
+

Modified: httpd/httpd/trunk/modules/session/mod_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/session/mod_session.c?rev=1887052&r1=1887051&r2=1887052&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/session/mod_session.c (original)
+++ httpd/httpd/trunk/modules/session/mod_session.c Mon Mar  1 20:13:54 2021
@@ -326,7 +326,7 @@ static apr_status_t ap_session_set(reque
 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, cons
  */
 static apr_status_t session_identity_encode(request_rec * r, session_rec * z)
 {
-
     char *buffer = NULL;
     int length = 0;
     if (z->expiry) {