You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2007/09/05 01:09:27 UTC
svn commit: r572832 - in /httpd/httpd/trunk/modules/proxy: mod_proxy.c
mod_proxy_balancer.c
Author: nd
Date: Tue Sep 4 16:09:24 2007
New Revision: 572832
URL: http://svn.apache.org/viewvc?rev=572832&view=rev
Log:
as not everyone needs sticky sessions - avoid segfault in balancer manager and
mod_status
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy.c
httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=572832&r1=572831&r2=572832&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Tue Sep 4 16:09:24 2007
@@ -2075,12 +2075,17 @@
ap_rputs("\n\n<table border=\"0\"><tr>"
"<th>SSes</th><th>Timeout</th><th>Method</th>"
"</tr>\n<tr>", r);
- if (strcmp(balancer->sticky, balancer->sticky_path)) {
- ap_rvputs(r, "<td>", balancer->sticky, " | ", balancer->sticky_path,
- NULL);
+ if (balancer->sticky) {
+ if (strcmp(balancer->sticky, balancer->sticky_path)) {
+ ap_rvputs(r, "<td>", balancer->sticky, " | ",
+ balancer->sticky_path, NULL);
+ }
+ else {
+ ap_rvputs(r, "<td>", balancer->sticky, NULL);
+ }
}
else {
- ap_rvputs(r, "<td>", balancer->sticky, NULL);
+ ap_rputs("<td> - ", r);
}
ap_rprintf(r, "</td><td>%" APR_TIME_T_FMT "</td>",
apr_time_sec(balancer->timeout));
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c?rev=572832&r1=572831&r2=572832&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c Tue Sep 4 16:09:24 2007
@@ -758,11 +758,17 @@
ap_rputs("\n\n<table border=\"0\" style=\"text-align: left;\"><tr>"
"<th>StickySession</th><th>Timeout</th><th>FailoverAttempts</th><th>Method</th>"
"</tr>\n<tr>", r);
- if (strcmp(balancer->sticky, balancer->sticky_path)) {
- ap_rvputs(r, "<td>", balancer->sticky, " | ", balancer->sticky_path, NULL);
+ if (balancer->sticky) {
+ if (strcmp(balancer->sticky, balancer->sticky_path)) {
+ ap_rvputs(r, "<td>", balancer->sticky, " | ",
+ balancer->sticky_path, NULL);
+ }
+ else {
+ ap_rvputs(r, "<td>", balancer->sticky, NULL);
+ }
}
else {
- ap_rvputs(r, "<td>", balancer->sticky, NULL);
+ ap_rputs("<td> - ", r);
}
ap_rprintf(r, "</td><td>%" APR_TIME_T_FMT "</td>",
apr_time_sec(balancer->timeout));