Author: jfrederic.clere(a)jboss.com
Date: 2009-01-19 06:15:47 -0500 (Mon, 19 Jan 2009)
New Revision: 2173
Modified:
trunk/mod_cluster/native/mod_manager/mod_manager.c
Log:
Arrange case where we remove the wrong context or the wrong host.
Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c
===================================================================
--- trunk/mod_cluster/native/mod_manager/mod_manager.c 2009-01-15 17:37:23 UTC (rev 2172)
+++ trunk/mod_cluster/native/mod_manager/mod_manager.c 2009-01-19 11:15:47 UTC (rev 2173)
@@ -1060,7 +1060,7 @@
return (process_node_cmd(r, status, errtype, node));
}
- /* Read the ID of the virtual corresponding to the first Alias */
+ /* Read the ID of the virtual host corresponding to the first Alias */
hostinfo.node = node->mess.id;
if (vhost->host != NULL)
strcpy(hostinfo.host, vhost->host);
@@ -1105,7 +1105,7 @@
break;
}
if (i==size) {
- hostinfo.id = host->vhost;
+ hostinfo.id = host->id;
remove_host(hoststatsmem, &hostinfo);
}
}
@@ -1278,7 +1278,7 @@
}
/*
- * Process the parameter and display corresponding information.
+ * Process the parameters and display corresponding informations.
*/
static void manager_info_contexts(request_rec *r, int node, int host)
{
@@ -1295,7 +1295,7 @@
char *status;
if (get_context(contextstatsmem, &ou, id[i]) != APR_SUCCESS)
continue;
- if (ou->node != node && ou->vhost != host)
+ if (ou->node != node || ou->vhost != host)
continue;
status = "REMOVED";
switch (ou->status) {
Show replies by date