Skip to content
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

Jump to bottom

[1.3.x] MODCLUSTER-824 Improve handling of overlapping aliases in APP commands #840

Open
wants to merge 1 commit into
base: 1.3.x
Choose a base branch
from
Open

[1.3.x] MODCLUSTER-824 Improve handling of overlapping aliases in APP commands #840

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 20 additions & 14 deletions native/mod_manager/mod_manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1666,7 +1666,7 @@ static char * process_appl_cmd(request_rec *r, char **ptr, int status, int *errt

int i = 0;
hostinfo_t hostinfo;
hostinfo_t *host;
hostinfo_t *host = NULL;
char *p_tmp;

memset(&nodeinfo.mess, '\0', sizeof(nodeinfo.mess));
Expand Down Expand Up @@ -1748,23 +1748,29 @@ static char * process_appl_cmd(request_rec *r, char **ptr, int status, int *errt
return (process_node_cmd(r, status, errtype, node));
}

/* Read the ID of the virtual host corresponding to the first Alias */
/* Go through the provided Aliases, the first Alias that matches an existing host gets used
* otherwise, a new host will be created
*/
hostinfo.node = node->mess.id;
hostinfo.id = 0;
if (vhost->host != NULL) {
char *s = hostinfo.host;
int j = 1;
strncpy(hostinfo.host, vhost->host, sizeof(hostinfo.host));
hostinfo.host[sizeof(hostinfo.host)-1] = '\0';
while (*s != ',' && j<sizeof(hostinfo.host)) {
j++;
s++;
}
*s = '\0';
} else
int start = 0;
i = 0;
while (host == NULL && i + start < strlen(vhost->host)) {
while (vhost->host[start+i] != ',' && vhost->host[start+i] != '\0') {
i++;
}

strncpy(hostinfo.host, vhost->host + start, i);
hostinfo.host[i] = '\0';
host = read_host(hoststatsmem, &hostinfo);
start = start + i + 1;
i = 0;
}
} else {
hostinfo.host[0] = '\0';
}

hostinfo.id = 0;
host = read_host(hoststatsmem, &hostinfo);
if (host == NULL) {
/* If REMOVE ignores it */
if (status == REMOVE)
Expand Down
Loading