Author: rjung
Date: Wed Jun 26 19:58:39 2013
New Revision: 1497064
URL: http://svn.apache.org/r1497064
Log:
Remove session_cookie and session_path from shm.
It would only be needed if we wanted to change
it dynamically, e.g. through the status worker.
This is not implemented currently.
Modified:
tomcat/jk/trunk/native/common/jk_lb_worker.c
tomcat/jk/trunk/native/common/jk_shm.h
Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1497064&r1=1497063&r2=1497064&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Wed Jun 26 19:58:39 2013
@@ -334,8 +334,6 @@ void jk_lb_pull(lb_worker_t *p, int lock
p->lbmethod = p->s->lbmethod;
p->lblock = p->s->lblock;
p->max_packet_size = p->s->max_packet_size;
- strncpy(p->session_cookie, p->s->session_cookie, JK_SHM_STR_SIZ);
- strncpy(p->session_path, p->s->session_path, JK_SHM_STR_SIZ);
for (i = 0; i < p->num_of_workers; i++) {
jk_lb_pull_worker(p, i, l);
@@ -370,8 +368,6 @@ void jk_lb_push(lb_worker_t *p, int lock
p->s->lbmethod = p->lbmethod;
p->s->lblock = p->lblock;
p->s->max_packet_size = p->max_packet_size;
- strncpy(p->s->session_cookie, p->session_cookie, JK_SHM_STR_SIZ);
- strncpy(p->s->session_path, p->session_path, JK_SHM_STR_SIZ);
for (i = 0; i < p->num_of_workers; i++) {
lb_sub_worker_t *w = &p->lb_workers[i];
@@ -1795,8 +1791,6 @@ static int JK_METHOD init(jk_worker_t *p
strncpy(p->session_path,
jk_get_lb_session_path(props, p->name, JK_PATH_SESSION_IDENTIFIER),
JK_SHM_STR_SIZ);
- strcpy(p->s->session_cookie, p->session_cookie);
- strcpy(p->s->session_path, p->session_path);
JK_INIT_CS(&(p->cs), i);
if (i == JK_FALSE) {
Modified: tomcat/jk/trunk/native/common/jk_shm.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_shm.h?rev=1497064&r1=1497063&r2=1497064&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_shm.h (original)
+++ tomcat/jk/trunk/native/common/jk_shm.h Wed Jun 26 19:58:39 2013
@@ -182,11 +182,6 @@ struct jk_shm_lb_worker
/* Last reset time */
volatile time_t last_reset;
volatile time_t last_maintain_time;
- /* Session cookie */
- char session_cookie[JK_SHM_STR_SIZ+1];
- /* Session path */
- char session_path[JK_SHM_STR_SIZ+1];
-
};
typedef struct jk_shm_lb_worker jk_shm_lb_worker_t;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
