www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

complete r771579, refactoring mod_watchdog as loadable on win32

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771581 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2009-05-05 06:26:24 +00:00
parent 7861cb5d18
commit 0fe6d791a5
10 changed files with 526 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
modules/proxy/proxy_util.c
View File

@@ -1052,6 +1052,7 @@ PROXY_DECLARE(const char *) ap_proxy_location_reverse_map(request_rec *r,
/*
* XXX FIXME: Make sure this handled the ambiguous case of the :<PORT>
* after the hostname
* XXX FIXME: Ensure the /uri component is a case sensitive match
*/
if (r->proxyreq != PROXYREQ_REVERSE) {
return url;
@@ -1069,56 +1070,55 @@ PROXY_DECLARE(const char *) ap_proxy_location_reverse_map(request_rec *r,
proxy_server_conf *sconf = (proxy_server_conf *)
ap_get_module_config(r->server->module_config, &proxy_module);
proxy_balancer *balancer;
const char *real;
real = ent[i].real;
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
"ppr: real: %s", real);
const char *real = ent[i].real;
/*
* First check if mapping against a balancer and see
* if we have such a entity. If so, then we need to
* find the particulars of the actual worker which may
* or may not be the right one... basically, we need
* to find which member actually handled this request.
*
* TODO: Recover the path from real and use that
* for more exact matching
*/
if ((strncasecmp(real, "balancer:", 9) == 0) &&
if ((strncasecmp(real, "balancer://", 11) == 0) &&
(balancer = ap_proxy_get_balancer(r->pool, sconf, real))) {
int n;
proxy_worker *worker;
worker = (proxy_worker *)balancer->workers->elts;
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
"ppr: checking balancer: %s",
balancer->name);
int n, l3;
proxy_worker *worker = (proxy_worker *)balancer->workers->elts;
const char *urlpart = ap_strchr_c(real + 11, '/');
if (urlpart) {
if (!urlpart[1])
urlpart = NULL;
else
l3 = strlen(urlpart);
}
/* The balancer comparison is a bit trickier. Given the context
* BalancerMember balancer://alias http://example.com/foo
* ProxyPassReverse /bash balancer://alias/bar
* translate url http://example.com/foo/bar/that to /bash/that
*/
for (n = 0; n < balancer->workers->nelts; n++) {
if (worker->port) {
u = apr_psprintf(r->pool, "%s://%s:%d/", worker->scheme,
worker->hostname, worker->port);
l2 = strlen(worker->name);
if (urlpart) {
if (worker->name[l2 - 1] == '/')
--l2;
if (l1 >= l2 + l3
&& strncasecmp(worker->name, url, l2) == 0
&& strncmp(urlpart, url + l2, l3) == 0) {
u = apr_pstrcat(r->pool, ent[i].fake,
&url[l2 + l3], NULL);
return ap_construct_url(r->pool, u, r);
}
}
else {
u = apr_psprintf(r->pool, "%s://%s/", worker->scheme,
worker->hostname);
}
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
"ppr: matching member (%s) and URL (%s)",
u, url);
l2 = strlen(u);
if (l1 >= l2 && strncasecmp(u, url, l2) == 0) {
else if (l1 >= l2 && strncasecmp(worker->name, url, l2) == 0) {
u = apr_pstrcat(r->pool, ent[i].fake, &url[l2], NULL);
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
"ppr: matched member (%s)", u);
return ap_construct_url(r->pool, u, r);
}
worker++;
}
}
l2 = strlen(real);
if (l1 >= l2 && strncasecmp(real, url, l2) == 0) {
u = apr_pstrcat(r->pool, ent[i].fake, &url[l2], NULL);
return ap_construct_url(r->pool, u, r);
else {
l2 = strlen(real);
if (l1 >= l2 && strncasecmp(real, url, l2) == 0) {
u = apr_pstrcat(r->pool, ent[i].fake, &url[l2], NULL);
return ap_construct_url(r->pool, u, r);
}
}