JBoss Native SVN: r2501 - trunk/mod_cluster/native/mod_proxy_cluster.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-07-22 02:34:24 -0400 (Wed, 22 Jul 2009)
New Revision: 2501
Modified:
trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c
Log:
Oops C++ code :-(
Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c
===================================================================
--- trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-07-21 10:58:50 UTC (rev 2500)
+++ trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-07-22 06:34:24 UTC (rev 2501)
@@ -836,6 +836,10 @@
hostinfo_t *vhost;
host_storage->read_host(vhosts[i], &vhost);
if (vhost->node == node->mess.id) {
+ int j;
+ int sizecontext = context_storage->get_max_size_context();
+ int *contexts = apr_palloc(r->pool, sizeof(int)*sizecontext);
+
/* Check the virtual host */
if (use_alias) {
#if HAVE_CLUSTER_EX_DEBUG
@@ -847,9 +851,6 @@
}
/* Check the contexts */
- int j;
- int sizecontext = context_storage->get_max_size_context();
- int *contexts = apr_palloc(r->pool, sizeof(int)*sizecontext);
sizecontext = context_storage->get_ids_used_context(contexts);
#if HAVE_CLUSTER_EX_DEBUG
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
15 years, 5 months
JBoss Native SVN: r2500 - trunk/mod_cluster/native/mod_proxy_cluster.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-07-21 06:58:50 -0400 (Tue, 21 Jul 2009)
New Revision: 2500
Modified:
trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c
Log:
Fix for MODCLUSTER-77
Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c
===================================================================
--- trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-07-21 10:09:50 UTC (rev 2499)
+++ trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-07-21 10:58:50 UTC (rev 2500)
@@ -81,6 +81,8 @@
#define CREAT_ROOT 2 /* Only create balancers/workers in the main server */
static int creat_bal = CREAT_ROOT;
+static int use_alias = 0; /* 1 : Compare Alias with server_name */
+
#define WAITFORREMOVE 10 /* seconds */
#define TIMEINTERVAL apr_time_from_sec(1) /* recalcul the lbstatus based on number of request in the time interval */
@@ -834,7 +836,15 @@
hostinfo_t *vhost;
host_storage->read_host(vhosts[i], &vhost);
if (vhost->node == node->mess.id) {
- /* XXX Check the virtual host */
+ /* Check the virtual host */
+ if (use_alias) {
+#if HAVE_CLUSTER_EX_DEBUG
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "get_balancer_by_node testing ServerName: %s host: %s", ap_get_server_name(r), vhost->host);
+#endif
+ if (strcmp(ap_get_server_name(r), vhost->host) != 0)
+ continue;
+ }
/* Check the contexts */
int j;
@@ -2276,6 +2286,17 @@
return NULL;
}
+static const char*cmd_proxy_cluster_use_alias(cmd_parms *cmd, void *dummy, const char *arg)
+{
+ int val = atoi(arg);
+ if (val<0 || val>1) {
+ return "UseAlias must be one of: 0 or 1";
+ } else {
+ use_alias = val;
+ }
+ return NULL;
+}
+
static const command_rec proxy_cluster_cmds[] =
{
AP_INIT_TAKE1(
@@ -2285,6 +2306,13 @@
OR_ALL,
"CreateBalancers - Defined VirtualHosts where the balancers are created 0: All, 1: None, 2: Main (Default: 2 Main)"
),
+ AP_INIT_TAKE1(
+ "UseAlias",
+ cmd_proxy_cluster_use_alias,
+ NULL,
+ OR_ALL,
+ "UseAlias - Check that the Alias corresponds to the ServerName 0: Don't (ignore Aliases), 1: Check it (Default: 0 Ignore)"
+ ),
{NULL}
};
15 years, 5 months
JBoss Native SVN: r2499 - tags/mod_cluster/1.0.0.GA/native/advertise.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-07-21 06:09:50 -0400 (Tue, 21 Jul 2009)
New Revision: 2499
Modified:
tags/mod_cluster/1.0.0.GA/native/advertise/buildconf
Log:
Make it executable, no changes.
Property changes on: tags/mod_cluster/1.0.0.GA/native/advertise/buildconf
___________________________________________________________________
Name: svn:executable
+ *
15 years, 5 months
JBoss Native SVN: r2498 - trunk/mod_cluster/native/advertise.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-07-21 06:01:49 -0400 (Tue, 21 Jul 2009)
New Revision: 2498
Modified:
trunk/mod_cluster/native/advertise/buildconf
Log:
Make it executable, no changes.
Property changes on: trunk/mod_cluster/native/advertise/buildconf
___________________________________________________________________
Name: svn:executable
+ *
15 years, 5 months
JBoss Native SVN: r2497 - trunk/mod_cluster/native/mod_manager.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-07-20 10:29:34 -0400 (Mon, 20 Jul 2009)
New Revision: 2497
Modified:
trunk/mod_cluster/native/mod_manager/mod_manager.c
Log:
Fix MODCLUSTER-50, and sort the node by domain.
Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c
===================================================================
--- trunk/mod_cluster/native/mod_manager/mod_manager.c 2009-07-20 08:12:06 UTC (rev 2496)
+++ trunk/mod_cluster/native/mod_manager/mod_manager.c 2009-07-20 14:29:34 UTC (rev 2497)
@@ -89,6 +89,11 @@
/* Internal substitution for node commands */
#define NODE_COMMAND "/NODE_COMMAND"
+/* range of the commands */
+#define RANGECONTEXT 0
+#define RANGENODE 1
+#define RANGEDOMAIN 2
+
/* shared memory */
mem_t *contextstatsmem = NULL;
mem_t *nodestatsmem = NULL;
@@ -1385,6 +1390,15 @@
ap_rprintf(r, "<a href=\"%s?nonce=%s&Cmd=DISABLE-APP&Range=NODE&%s\">Disable Contexts</a>",
r->uri, balancer_nonce, node_string(r, JVMRoute));
}
+static void domain_command_string(request_rec *r, int status, char *Domain)
+{
+ if (status == ENABLED)
+ ap_rprintf(r, "<a href=\"%s?nonce=%s&Cmd=ENABLE-APP&Range=DOMAIN&Domain=%s\">Enable Nodes</a> ",
+ r->uri, balancer_nonce, Domain);
+ if (status == DISABLED)
+ ap_rprintf(r, "<a href=\"%s?nonce=%s&Cmd=DISABLE-APP&Range=DOMAIN&Domain=%s\">Disable Nodes</a>",
+ r->uri, balancer_nonce, Domain);
+}
/*
* Process the parameters and display corresponding informations.
@@ -1512,6 +1526,60 @@
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
"manager_handler %s error: %s", r->method, errstring);
}
+static void sort_nodes(nodeinfo_t *nodes, int nbnodes)
+{
+ int i;
+ int changed = -1;
+ if (nbnodes <=1)
+ return;
+ while(changed) {
+ changed = 0;
+ for (i=0; i<nbnodes-1; i++) {
+ if (strcmp(nodes[i].mess.Domain, nodes[i+1].mess.Domain)> 0) {
+ nodeinfo_t node;
+ node = nodes[i+1];
+ nodes[i+1] = nodes[i];
+ nodes[i] = node;
+ changed = -1;
+ }
+ }
+ }
+}
+static char *process_domain(request_rec *r, char **ptr, int *errtype, const char *cmd, const char *domain)
+{
+ int size, i;
+ int *id;
+ int pos;
+ char *errstring = NULL;
+ size = get_max_size_node(nodestatsmem);
+ id = apr_palloc(r->pool, sizeof(int) * size);
+ size = get_ids_used_node(nodestatsmem, id);
+
+ for (pos=0;ptr[pos]!=NULL && ptr[pos+1]!=NULL; pos=pos+2) ;
+
+ ptr[pos] = apr_pstrdup(r->pool, "JVMRoute");
+ ptr[pos+2] = NULL;
+ ptr[pos+3] = NULL;
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, r->server, "process_domain");
+ for (i=0; i<size; i++) {
+ nodeinfo_t *ou;
+ if (get_node(nodestatsmem, &ou, id[i]) != APR_SUCCESS)
+ continue;
+ if (strcmp(ou->mess.Domain, domain) != 0)
+ continue;
+ /* add the JVMRoute */
+ ptr[pos+1] = apr_pstrdup(r->pool, ou->mess.JVMRoute);
+ if (strcasecmp(cmd, "ENABLE-APP") == 0)
+ errstring = process_enable(r, ptr, errtype, RANGENODE);
+ else if (strcasecmp(cmd, "DISABLE-APP") == 0)
+ errstring = process_disable(r, ptr, errtype, RANGENODE);
+ else if (strcasecmp(cmd, "STOP-APP") == 0)
+ errstring = process_stop(r, ptr, errtype, RANGENODE);
+ else if (strcasecmp(cmd, "REMOVE-APP") == 0)
+ errstring = process_remove(r, ptr, errtype, RANGENODE);
+ }
+ return errstring;
+}
static int manager_info(request_rec *r)
{
int size, i, sizesessionid;
@@ -1519,6 +1587,9 @@
apr_table_t *params = apr_table_make(r->pool, 10);
int access_status;
const char *name;
+ nodeinfo_t *nodes;
+ int nbnodes = 0;
+ char *domain = "";
if (r->args) {
char *args = apr_pstrdup(r->pool, r->args);
@@ -1556,6 +1627,7 @@
const char *val = apr_table_get(params, "Refresh");
const char *cmd = apr_table_get(params, "Cmd");
const char *typ = apr_table_get(params, "Range");
+ const char *domain = apr_table_get(params, "Domain");
/* Process the Refresh parameter */
if (val) {
long t = atol(val);
@@ -1563,7 +1635,7 @@
}
/* Process command if any */
if (cmd != NULL && typ !=NULL) {
- int global = 0;
+ int global = RANGECONTEXT;
char *errstring = NULL;
int errtype = 0;
int i;
@@ -1571,7 +1643,15 @@
const apr_array_header_t *arr = apr_table_elts(params);
const apr_table_entry_t *elts = (const apr_table_entry_t *)arr->elts;
- ptr = apr_palloc(r->pool, sizeof(char *) * (arr->nelts + 1) * 2);
+ if (strcasecmp(typ,"NODE")==0)
+ global = RANGENODE;
+ else if (strcasecmp(typ,"DOMAIN")==0)
+ global = RANGEDOMAIN;
+
+ if (global == RANGEDOMAIN)
+ ptr = apr_palloc(r->pool, sizeof(char *) * (arr->nelts + 2) * 2);
+ else
+ ptr = apr_palloc(r->pool, sizeof(char *) * (arr->nelts + 1) * 2);
for (i = 0; i < arr->nelts; i++) {
ptr[i*2] = elts[i].key;
ptr[i*2+1] = elts[i].val;
@@ -1579,9 +1659,9 @@
ptr[arr->nelts*2] = NULL;
ptr[arr->nelts*2+1] = NULL;
- if (strcasecmp(typ,"NODE")==0)
- global = 1;
- if (strcasecmp(cmd, "ENABLE-APP") == 0)
+ if (global == RANGEDOMAIN)
+ errstring = process_domain(r, ptr, &errtype, cmd, domain);
+ else if (strcasecmp(cmd, "ENABLE-APP") == 0)
errstring = process_enable(r, ptr, &errtype, global);
else if (strcasecmp(cmd, "DISABLE-APP") == 0)
errstring = process_disable(r, ptr, &errtype, global);
@@ -1631,12 +1711,32 @@
size = get_max_size_node(nodestatsmem);
id = apr_palloc(r->pool, sizeof(int) * size);
size = get_ids_used_node(nodestatsmem, id);
+
+
+ /* read the node to sort them by domain */
+ nodes = apr_palloc(r->pool, sizeof(nodeinfo_t) * size);
for (i=0; i<size; i++) {
nodeinfo_t *ou;
+ if (get_node(nodestatsmem, &ou, id[i]) != APR_SUCCESS)
+ continue;
+ memcpy(&nodes[nbnodes],ou, sizeof(nodeinfo_t));
+ nbnodes++;
+ }
+ sort_nodes(nodes, nbnodes);
+
+ /* display the ordered nodes */
+ for (i=0; i<size; i++) {
proxy_worker_stat *proxystat;
char *flushpackets;
- if (get_node(nodestatsmem, &ou, id[i]) != APR_SUCCESS)
- continue;
+ nodeinfo_t *ou = &nodes[i];
+
+ if (strcmp(domain, ou->mess.Domain) != 0) {
+ ap_rprintf(r, "<h1> Domain %s: ", ou->mess.Domain);
+ domain = ou->mess.Domain;
+ domain_command_string(r, ENABLED, domain);
+ domain_command_string(r, DISABLED, domain);
+ ap_rprintf(r, "</h1>\n");
+ }
ap_rprintf(r, "<h1> Node %s (%s://%s:%s): ",
ou->mess.JVMRoute, ou->mess.Type, ou->mess.Host, ou->mess.Port);
15 years, 5 months
JBoss Native SVN: r2496 - trunk/mod_cluster/native/mod_manager.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-07-20 04:12:06 -0400 (Mon, 20 Jul 2009)
New Revision: 2496
Modified:
trunk/mod_cluster/native/mod_manager/mod_manager.c
Log:
Fix for MODCLUSTER-79 (not exactly but transforming the output into
mod_proxy directives doesn't bring a lot more).
Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c
===================================================================
--- trunk/mod_cluster/native/mod_manager/mod_manager.c 2009-07-14 14:21:56 UTC (rev 2495)
+++ trunk/mod_cluster/native/mod_manager/mod_manager.c 2009-07-20 08:12:06 UTC (rev 2496)
@@ -1589,7 +1589,15 @@
errstring = process_stop(r, ptr, &errtype, global);
else if (strcasecmp(cmd, "REMOVE-APP") == 0)
errstring = process_remove(r, ptr, &errtype, global);
- else {
+ else if (strcasecmp(cmd, "DUMP") == 0) {
+ errstring = process_dump(r, ptr, &errtype);
+ if (!errstring)
+ return OK;
+ } else if (strcasecmp(cmd, "INFO") == 0) {
+ errstring = process_info(r, ptr, &errtype);
+ if (!errstring)
+ return OK;
+ } else {
errstring = SCMDUNS;
errtype = TYPESYNTAX;
}
@@ -1608,6 +1616,14 @@
"&refresh=10",
"\">Auto Refresh</a>", NULL);
+ ap_rvputs(r, " <a href=\"", r->uri, "?nonce=", balancer_nonce,
+ "&Cmd=DUMP&Range=ALL",
+ "\">show DUMP output</a>", NULL);
+
+ ap_rvputs(r, " <a href=\"", r->uri, "?nonce=", balancer_nonce,
+ "&Cmd=INFO&Range=ALL",
+ "\">show INFO output</a>", NULL);
+
ap_rputs("<pre>", r);
sizesessionid = get_max_size_sessionid(sessionidstatsmem);
15 years, 5 months
JBoss Native SVN: r2495 - trunk/mod_cluster/native/mod_proxy_cluster.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-07-14 10:21:56 -0400 (Tue, 14 Jul 2009)
New Revision: 2495
Modified:
trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c
Log:
Fix for MODCLUSTER-37.
Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c
===================================================================
--- trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-07-14 09:10:44 UTC (rev 2494)
+++ trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-07-14 14:21:56 UTC (rev 2495)
@@ -1506,6 +1506,97 @@
return NULL;
}
+/* Copied from httpd mod_proxy */
+static const char *proxy_interpolate(request_rec *r, const char *str)
+{
+ /* Interpolate an env str in a configuration string
+ * Syntax ${var} --> value_of(var)
+ * Method: replace one var, and recurse on remainder of string
+ * Nothing clever here, and crap like nested vars may do silly things
+ * but we'll at least avoid sending the unwary into a loop
+ */
+ const char *start;
+ const char *end;
+ const char *var;
+ const char *val;
+ const char *firstpart;
+
+ start = ap_strstr_c(str, "${");
+ if (start == NULL) {
+ return str;
+ }
+ end = ap_strchr_c(start+2, '}');
+ if (end == NULL) {
+ return str;
+ }
+ /* OK, this is syntax we want to interpolate. Is there such a var ? */
+ var = apr_pstrndup(r->pool, start+2, end-(start+2));
+ val = apr_table_get(r->subprocess_env, var);
+ firstpart = apr_pstrndup(r->pool, str, (start-str));
+
+ if (val == NULL) {
+ return apr_pstrcat(r->pool, firstpart,
+ proxy_interpolate(r, end+1), NULL);
+ }
+ else {
+ return apr_pstrcat(r->pool, firstpart, val,
+ proxy_interpolate(r, end+1), NULL);
+ }
+}
+/* Copied from httpd mod_proxy */
+static int alias_match(const char *uri, const char *alias_fakename)
+{
+ const char *end_fakename = alias_fakename + strlen(alias_fakename);
+ const char *aliasp = alias_fakename, *urip = uri;
+ const char *end_uri = uri + strlen(uri);
+
+ while (aliasp < end_fakename && urip < end_uri) {
+ if (*aliasp == '/') {
+ /* any number of '/' in the alias matches any number in
+ * the supplied URI, but there must be at least one...
+ */
+ if (*urip != '/')
+ return 0;
+
+ while (*aliasp == '/')
+ ++aliasp;
+ while (*urip == '/')
+ ++urip;
+ }
+ else {
+ /* Other characters are compared literally */
+ if (*urip++ != *aliasp++)
+ return 0;
+ }
+ }
+
+ /* fixup badly encoded stuff (e.g. % as last character) */
+ if (aliasp > end_fakename) {
+ aliasp = end_fakename;
+ }
+ if (urip > end_uri) {
+ urip = end_uri;
+ }
+
+ /* We reach the end of the uri before the end of "alias_fakename"
+ * for example uri is "/" and alias_fakename "/examples"
+ */
+ if (urip == end_uri && aliasp!=end_fakename) {
+ return 0;
+ }
+
+ /* Check last alias path component matched all the way */
+ if (aliasp[-1] != '/' && *urip != '\0' && *urip != '/')
+ return 0;
+
+ /* Return number of characters from URI which matched (may be
+ * greater than length of alias, since we may have matched
+ * doubled slashes)
+ */
+
+ return urip - uri;
+}
+
/*
* See if we could map the request.
* first check is we have a balancer corresponding to the route.
@@ -1534,6 +1625,35 @@
balancer = get_context_host_balancer(r);
if (balancer) {
+ int i;
+ struct proxy_alias *ent = (struct proxy_alias *) conf->aliases->elts;
+ /* Check that we don't have a ProxyPassMatch ^(/.*\.gif)$ ! or something similar */
+ for (i = 0; i < conf->aliases->nelts; i++) {
+ if (ent[i].real[0] == '!' && ent[i].real[1] == '\0') {
+ ap_regmatch_t regm[AP_MAX_REG_MATCH];
+ if (ent[i].regex) {
+ if (!ap_regexec(ent[i].regex, r->uri, AP_MAX_REG_MATCH, regm, 0)) {
+ return DECLINED;
+ }
+ }
+ else {
+ const char *fake;
+ proxy_dir_conf *dconf = ap_get_module_config(r->per_dir_config,
+ &proxy_module);
+ if ((dconf->interpolate_env == 1)
+ && (ent[i].flags & PROXYPASS_INTERPOLATE)) {
+ fake = proxy_interpolate(r, ent[i].fake);
+ }
+ else {
+ fake = ent[i].fake;
+ }
+ if (alias_match(r->uri, fake)) {
+ return DECLINED;
+ }
+ }
+ }
+ }
+
r->filename = apr_pstrcat(r->pool, "proxy:balancer://", balancer, r->unparsed_uri, NULL);
r->handler = "proxy-server";
r->proxyreq = PROXYREQ_REVERSE;
15 years, 5 months
JBoss Native SVN: r2494 - trunk/mod_cluster/native/mod_proxy_cluster.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-07-14 05:10:44 -0400 (Tue, 14 Jul 2009)
New Revision: 2494
Modified:
trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c
Log:
Fix MODCLUSTER-81.
Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c
===================================================================
--- trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-07-14 07:46:15 UTC (rev 2493)
+++ trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-07-14 09:10:44 UTC (rev 2494)
@@ -870,10 +870,11 @@
break;
case DISABLED:
/* Only the request with sessionid ok for it */
- if (hassession_byname(r, node->mess.balancer, conf, NULL))
+ if (hassession_byname(r, node->mess.balancer, conf, NULL)) {
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
"get_balancer_by_node found (DISABLED) context %s", context->context);
return node->mess.balancer;
+ }
break;
}
}
15 years, 5 months
JBoss Native SVN: r2493 - trunk/mod_cluster/native/mod_proxy_cluster.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-07-14 03:46:15 -0400 (Tue, 14 Jul 2009)
New Revision: 2493
Modified:
trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c
Log:
Fix for MODCLUSTER-80.
Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c
===================================================================
--- trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-07-14 06:44:48 UTC (rev 2492)
+++ trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-07-14 07:46:15 UTC (rev 2493)
@@ -757,7 +757,7 @@
* Check that the request has a sessionid (even invalid)
* @param r the request_rec.
* @param balancer_name name of the balancer. (to find the balancer)
- * @param conf the proxy configuration.
+ * @param conf the proxy configuration. (Could be null
* @param balance the balancer (balancer to use).
* @return 1 is it finds a sessionid 0 otherwise.
*/
@@ -769,6 +769,11 @@
char *sticky_used;
int i;
+ if (conf == NULL) {
+ void *sconf = r->server->module_config;
+ conf = (proxy_server_conf *) ap_get_module_config(sconf, &proxy_module);
+ }
+
if (balancer == NULL) {
balancer = (proxy_balancer *)conf->balancers->elts;
for (i = 0; i < conf->balancers->nelts; i++, balancer++) {
15 years, 5 months
JBoss Native SVN: r2492 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-07-14 02:44:48 -0400 (Tue, 14 Jul 2009)
New Revision: 2492
Modified:
trunk/build/unix/buildsrc.mod_cluster.sh
Log:
Patches for libtool 2.2.x
Modified: trunk/build/unix/buildsrc.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildsrc.mod_cluster.sh 2009-07-13 14:49:37 UTC (rev 2491)
+++ trunk/build/unix/buildsrc.mod_cluster.sh 2009-07-14 06:44:48 UTC (rev 2492)
@@ -99,6 +99,8 @@
else
rm -rf ${dirsources}/srclib/apr-iconv
fi
+ # Apply other patches.
+ $build_top/util/applypatch.sh $build_top ${dirsources} false
else
echo "Cannot find package sources in ${dirnmake}"
exit 1
15 years, 5 months