Author: rjung
Date: Mon Dec 21 23:29:11 2009
New Revision: 893028
URL: http://svn.apache.org/viewvc?rev=893028&view=rev
Log:
BZ45610: Fix erroneous unsetting of sticky_session
and sticky_session_force when updating other
load balancer attributes via the status worker.
Modified:
tomcat/jk/trunk/native/common/jk_status.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_status.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_status.c?rev=893028&r1=893027&r2=893028&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_status.c (original)
+++ tomcat/jk/trunk/native/common/jk_status.c Mon Dec 21 23:29:11 2009
@@ -3106,7 +3106,7 @@
lb->max_reply_timeouts = i;
sync_needed = JK_TRUE;
}
- i = status_get_bool(p, JK_STATUS_ARG_LB_STICKY, 0, l);
+ i = status_get_bool(p, JK_STATUS_ARG_LB_STICKY, lb->sticky_session, l);
if (i != lb->sticky_session) {
jk_log(l, JK_LOG_INFO,
"Status worker '%s' setting 'sticky_session' for lb worker '%s'
to '%i'",
@@ -3114,7 +3114,7 @@
lb->sticky_session = i;
sync_needed = JK_TRUE;
}
- i = status_get_bool(p, JK_STATUS_ARG_LB_STICKY_FORCE, 0, l);
+ i = status_get_bool(p, JK_STATUS_ARG_LB_STICKY_FORCE,
lb->sticky_session_force, l);
if (i != lb->sticky_session_force) {
jk_log(l, JK_LOG_INFO,
"Status worker '%s' setting 'sticky_session_force' for lb
worker '%s' to '%i'",
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=893028&r1=893027&r2=893028&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Dec 21 23:29:11 2009
@@ -44,6 +44,11 @@
<subsection name="Native">
<changelog>
<fix>
+ <bug>45610</bug>: Status: Fix erroneous unsetting of
+ sticky_session and sticky_session_force when updating other
+ load balancer attributes via the status worker. (rjung)
+ </fix>
+ <fix>
<bug>48276</bug>: When worker contact cannot be resolved mark the
worker as disabled instead failing to start the server. (mturk)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
