Merge pull request #290 from jajik/MODCLUSTER-824

Improve handling of overlapping aliases in APP commands

Author: jajik

native/mod_manager/mod_manager.c

@@ -2084,7 +2084,7 @@ static char *process_appl_cmd(request_rec *r, char **ptr, int status, int *errty
 
     int i = 0;
     hostinfo_t hostinfo;
-    hostinfo_t *host;
+    hostinfo_t *host = NULL;
     char *err_msg;
 
     memset(&nodeinfo.mess, '\0', sizeof(nodeinfo.mess));
@@ -2158,22 +2158,29 @@ static char *process_appl_cmd(request_rec *r, char **ptr, int status, int *errty
         return ret;
     }
 
-    /* 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;
-        unsigned j = 1;
-        strncpy(hostinfo.host, vhost->host, HOSTALIASZ);
-        while (*s != '\0' && *s != ',' && j < sizeof(hostinfo.host)) {
-            j++;
-            s++;
-        }
-        *s = '\0';
+        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) {
         int vid, size, *id;