Skip to content

[MODCLUSTER-347] fix mod_cluster-manager to print out a Virtual Host just once with all aliases together #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 14, 2013
Merged

[MODCLUSTER-347] fix mod_cluster-manager to print out a Virtual Host just once with all aliases together #35

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b16e25a
[MODCLUSTER-347] fix mod_cluster-manager to print out a Virtual Host …
aogburn Jun 28, 2013
ff8f1e9
[MODCLUSTER-347] fix pointer/array initialization to compile on all p…
aogburn Aug 12, 2013
5b1ddfe
[MODCLUSTER-347] optimizing
aogburn Aug 13, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 32 additions & 6 deletions native/mod_manager/mod_manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2011,8 +2011,8 @@ static void manager_info_contexts(request_rec *r, int reduce_display, int allow_
}
static void manager_info_hosts(request_rec *r, int reduce_display, int allow_cmd, int node, char *JVMRoute)
{
int size, i;
int *id;
int size, i, j;
int *id, *idChecker;
int vhost = 0;

/* Process the Vhosts */
Expand All @@ -2021,13 +2021,17 @@ static void manager_info_hosts(request_rec *r, int reduce_display, int allow_cmd
return;
id = apr_palloc(r->pool, sizeof(int) * size);
size = get_ids_used_host(hoststatsmem, id);
idChecker = apr_pcalloc(r->pool, sizeof(int) * size);
for (i=0; i<size; i++) {
hostinfo_t *ou;
if (get_host(hoststatsmem, &ou, id[i]) != APR_SUCCESS)
continue;
if (ou->node != node)
continue;
if (ou->vhost != vhost) {
/* if we've logged this already, contine */
if (idChecker[i] == 1)
continue;
if (vhost && !reduce_display)
ap_rprintf(r, "</pre>");
if (!reduce_display)
Expand All @@ -2040,11 +2044,33 @@ static void manager_info_hosts(request_rec *r, int reduce_display, int allow_cmd
ap_rprintf(r, "<pre>");
}
vhost = ou->vhost;

if (reduce_display)
ap_rprintf(r, "%.*s ", (int) sizeof(ou->host), ou->host);
else
ap_rprintf(r, "%.*s\n", (int) sizeof(ou->host), ou->host);

/* Go ahead and check for any other later alias entries for this vhost and print them now */
for (j=i+1; j<size; j++) {
hostinfo_t *pv;
if (get_host(hoststatsmem, &pv, id[j]) != APR_SUCCESS)
continue;
if (pv->node != node)
continue;
if (pv->vhost != vhost)
continue;

/* mark this entry as logged */
idChecker[j]=1;
/* step the outer loop forward if we can */
if (i == j-1)
i++;
if (reduce_display)
ap_rprintf(r, "%.*s ", (int) sizeof(pv->host), pv->host);
else
ap_rprintf(r, "%.*s\n", (int) sizeof(pv->host), pv->host);
}
}
if (reduce_display)
ap_rprintf(r, "%.*s ", (int) sizeof(ou->host), ou->host);
else
ap_rprintf(r, "%.*s\n", (int) sizeof(ou->host), ou->host);
}
if (size && !reduce_display)
ap_rprintf(r, "</pre>");
Expand Down