diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c

index 6061e53..75c2a35 100644

--- a/modules/mappers/mod_rewrite.c

+++ b/modules/mappers/mod_rewrite.c

@@ -4120,6 +4120,7 @@ static int apply_rewrite_rule(rewriterule_entry *p, rewrite_ctx *ctx)

                     r->filename));

         r->filename = apr_pstrcat(r->pool, "proxy:", r->filename, NULL);

+        apr_table_setn(r->notes, "rewrite-proxy", "1");

         return 1;

     }

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c

index b9d71fa..7f96aff 100644

--- a/modules/proxy/mod_proxy.c

+++ b/modules/proxy/mod_proxy.c

@@ -1348,7 +1348,6 @@ static void *merge_proxy_dir_config(apr_pool_t *p, void *basev, void *addv)

     return new;

 }

-

 static const char *

     add_proxy(cmd_parms *cmd, void *dummy, const char *f1, const char *r1, int regex)

 {

@@ -1423,6 +1422,36 @@ static const char *

     return add_proxy(cmd, dummy, f1, r1, 1);

 }

+static char *de_socketfy(apr_pool_t *p, char *url)

+{

+    char *ptr;

+    /*

+     * We could be passed a URL during the config stage that contains

+     * the UDS path... ignore it

+     */

+    if (!strncasecmp(url, "unix:", 5) &&

+        ((ptr = ap_strchr(url, '|')) != NULL)) {

+        /* move past the 'unix:...|' UDS path info */

+        char *ret, *c;

+

+        ret = ptr + 1;

+        /* special case: "unix:....|scheme:" is OK, expand

+         * to "unix:....|scheme://localhost"

+         * */

+        c = ap_strchr(ret, ':');

+        if (c == NULL) {

+            return NULL;

+        }

+        if (c[1] == '\0') {

+            return apr_pstrcat(p, ret, "//localhost", NULL);

+        }

+        else {

+            return ret;

+        }

+    }

+    return url;

+}

+

 static const char *

     add_pass(cmd_parms *cmd, void *dummy, const char *arg, int is_regex)

 {

@@ -1514,7 +1543,7 @@ static const char *

     }

     new->fake = apr_pstrdup(cmd->pool, f);

-    new->real = apr_pstrdup(cmd->pool, r);

+    new->real = apr_pstrdup(cmd->pool, de_socketfy(cmd->pool, r));

     new->flags = flags;

     if (use_regex) {

         new->regex = ap_pregcomp(cmd->pool, f, AP_REG_EXTENDED);

@@ -1550,26 +1579,41 @@ static const char *

         new->balancer = balancer;

     }

     else {

-        proxy_worker *worker = ap_proxy_get_worker(cmd->temp_pool, NULL, conf, r);

+        proxy_worker *worker = ap_proxy_get_worker(cmd->temp_pool, NULL, conf, new->real);

         int reuse = 0;

         if (!worker) {

-            const char *err = ap_proxy_define_worker(cmd->pool, &worker, NULL, conf, r, 0);

+            const char *err;

+            if (use_regex) {

+                err = ap_proxy_define_match_worker(cmd->pool, &worker, NULL,

+                                                   conf, r, 0);

+            }

+            else {

+                err = ap_proxy_define_worker(cmd->pool, &worker, NULL,

+                                             conf, r, 0);

+            }

             if (err)

                 return apr_pstrcat(cmd->temp_pool, "ProxyPass ", err, NULL);

             PROXY_COPY_CONF_PARAMS(worker, conf);

-        } else {

+        }

+        else if ((use_regex != 0) ^ (worker->s->is_name_matchable)) {

+            return apr_pstrcat(cmd->temp_pool, "ProxyPass/<Proxy> and "

+                               "ProxyPassMatch/<ProxyMatch> can't be used "

+                               "altogether with the same worker name ",

+                               "(", worker->s->name, ")", NULL);

+        }

+        else {

             reuse = 1;

             ap_log_error(APLOG_MARK, APLOG_INFO, 0, cmd->server, APLOGNO(01145)

                          "Sharing worker '%s' instead of creating new worker '%s'",

-                         worker->s->name, new->real);

+                         ap_proxy_worker_name(cmd->pool, worker), new->real);

         }

         for (i = 0; i < arr->nelts; i++) {

             if (reuse) {

                 ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server, APLOGNO(01146)

                              "Ignoring parameter '%s=%s' for worker '%s' because of worker sharing",

-                             elts[i].key, elts[i].val, worker->s->name);

+                             elts[i].key, elts[i].val, ap_proxy_worker_name(cmd->pool, worker));

             } else {

                 const char *err = set_worker_param(cmd->pool, worker, elts[i].key,

                                                    elts[i].val);

@@ -2026,7 +2070,7 @@ static const char *add_member(cmd_parms *cmd, void *dummy, const char *arg)

     }

     /* Try to find existing worker */

-    worker = ap_proxy_get_worker(cmd->temp_pool, balancer, conf, name);

+    worker = ap_proxy_get_worker(cmd->temp_pool, balancer, conf, de_socketfy(cmd->temp_pool, name));

     if (!worker) {

         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server, APLOGNO(01147)

                      "Defining worker '%s' for balancer '%s'",

@@ -2035,13 +2079,13 @@ static const char *add_member(cmd_parms *cmd, void *dummy, const char *arg)

             return apr_pstrcat(cmd->temp_pool, "BalancerMember ", err, NULL);

         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server, APLOGNO(01148)

                      "Defined worker '%s' for balancer '%s'",

-                     worker->s->name, balancer->s->name);

+                     ap_proxy_worker_name(cmd->pool, worker), balancer->s->name);

         PROXY_COPY_CONF_PARAMS(worker, conf);

     } else {

         reuse = 1;

         ap_log_error(APLOG_MARK, APLOG_INFO, 0, cmd->server, APLOGNO(01149)

                      "Sharing worker '%s' instead of creating new worker '%s'",

-                     worker->s->name, name);

+                     ap_proxy_worker_name(cmd->pool, worker), name);

     }

     arr = apr_table_elts(params);

@@ -2050,7 +2094,7 @@ static const char *add_member(cmd_parms *cmd, void *dummy, const char *arg)

         if (reuse) {

             ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server, APLOGNO(01150)

                          "Ignoring parameter '%s=%s' for worker '%s' because of worker sharing",

-                         elts[i].key, elts[i].val, worker->s->name);

+                         elts[i].key, elts[i].val, ap_proxy_worker_name(cmd->pool, worker));

         } else {

             err = set_worker_param(cmd->pool, worker, elts[i].key,

                                                elts[i].val);

@@ -2112,7 +2156,7 @@ static const char *

         }

     }

     else {

-        worker = ap_proxy_get_worker(cmd->temp_pool, NULL, conf, name);

+        worker = ap_proxy_get_worker(cmd->temp_pool, NULL, conf, de_socketfy(cmd->temp_pool, name));

         if (!worker) {

             if (in_proxy_section) {

                 err = ap_proxy_define_worker(cmd->pool, &worker, NULL,

@@ -2170,6 +2214,7 @@ static const char *proxysection(cmd_parms *cmd, void *mconfig, const char *arg)

     char *word, *val;

     proxy_balancer *balancer = NULL;

     proxy_worker *worker = NULL;

+    int use_regex = 0;

     const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE);

     proxy_server_conf *sconf =

@@ -2219,6 +2264,7 @@ static const char *proxysection(cmd_parms *cmd, void *mconfig, const char *arg)

         if (!r) {

             return "Regex could not be compiled";

         }

+        use_regex = 1;

     }

     /* initialize our config and fetch it */

@@ -2258,14 +2304,26 @@ static const char *proxysection(cmd_parms *cmd, void *mconfig, const char *arg)

         }

         else {

             worker = ap_proxy_get_worker(cmd->temp_pool, NULL, sconf,

-                                         conf->p);

+                                         de_socketfy(cmd->temp_pool, (char*)conf->p));

             if (!worker) {

-                err = ap_proxy_define_worker(cmd->pool, &worker, NULL,

-                                          sconf, conf->p, 0);

+                if (use_regex) {

+                    err = ap_proxy_define_match_worker(cmd->pool, &worker, NULL,

+                                                       sconf, conf->p, 0);

+                }

+                else {

+                    err = ap_proxy_define_worker(cmd->pool, &worker, NULL,

+                                                 sconf, conf->p, 0);

+                }

                 if (err)

                     return apr_pstrcat(cmd->temp_pool, thiscmd->name,

                                        " ", err, NULL);

             }

+            else if ((use_regex != 0) ^ (worker->s->is_name_matchable)) {

+                return apr_pstrcat(cmd->temp_pool, "ProxyPass/<Proxy> and "

+                                   "ProxyPassMatch/<ProxyMatch> can't be used "

+                                   "altogether with the same worker name ",

+                                   "(", worker->s->name, ")", NULL);

+            }

         }

         if (worker == NULL && balancer == NULL) {

             return apr_pstrcat(cmd->pool, thiscmd->name,

@@ -2570,6 +2628,8 @@ static void child_init(apr_pool_t *p, server_rec *s)

                 ap_proxy_hashfunc(conf->forward->s->name, PROXY_HASHFUNC_FNV);

             /* Do not disable worker in case of errors */

             conf->forward->s->status |= PROXY_WORKER_IGNORE_ERRORS;

+            /* Mark as the "generic" worker */

+            conf->forward->s->status |= PROXY_WORKER_GENERIC;

             ap_proxy_initialize_worker(conf->forward, s, conf->pool);

             /* Disable address cache for generic forward worker */

             conf->forward->s->is_address_reusable = 0;

@@ -2585,6 +2645,8 @@ static void child_init(apr_pool_t *p, server_rec *s)

                 ap_proxy_hashfunc(reverse->s->name, PROXY_HASHFUNC_FNV);

             /* Do not disable worker in case of errors */

             reverse->s->status |= PROXY_WORKER_IGNORE_ERRORS;

+            /* Mark as the "generic" worker */

+            reverse->s->status |= PROXY_WORKER_GENERIC;

             conf->reverse = reverse;

             ap_proxy_initialize_worker(conf->reverse, s, conf->pool);

             /* Disable address cache for generic reverse worker */

diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h

index 81fd14c..4fb21c7 100644

--- a/modules/proxy/mod_proxy.h

+++ b/modules/proxy/mod_proxy.h

@@ -249,6 +249,7 @@ typedef struct {

     unsigned int need_flush:1; /* Flag to decide whether we need to flush the

                                 * filter chain or not */

     unsigned int inreslist:1;  /* connection in apr_reslist? */

+    const char   *uds_path;    /* Unix domain socket path */

 } proxy_conn_rec;

 typedef struct {

@@ -269,6 +270,7 @@ struct proxy_conn_pool {

 #define PROXY_WORKER_INITIALIZED    0x0001

 #define PROXY_WORKER_IGNORE_ERRORS  0x0002

 #define PROXY_WORKER_DRAIN          0x0004

+#define PROXY_WORKER_GENERIC        0x0008

 #define PROXY_WORKER_IN_SHUTDOWN    0x0010

 #define PROXY_WORKER_DISABLED       0x0020

 #define PROXY_WORKER_STOPPED        0x0040

@@ -280,6 +282,7 @@ struct proxy_conn_pool {

 #define PROXY_WORKER_INITIALIZED_FLAG    'O'

 #define PROXY_WORKER_IGNORE_ERRORS_FLAG  'I'

 #define PROXY_WORKER_DRAIN_FLAG          'N'

+#define PROXY_WORKER_GENERIC_FLAG        'G'

 #define PROXY_WORKER_IN_SHUTDOWN_FLAG    'U'

 #define PROXY_WORKER_DISABLED_FLAG       'D'

 #define PROXY_WORKER_STOPPED_FLAG        'S'

@@ -300,6 +303,8 @@ PROXY_WORKER_DISABLED | PROXY_WORKER_STOPPED | PROXY_WORKER_IN_ERROR )

 #define PROXY_WORKER_IS_DRAINING(f)   ( (f)->s->status &  PROXY_WORKER_DRAIN )

+#define PROXY_WORKER_IS_GENERIC(f)   ( (f)->s->status &  PROXY_WORKER_GENERIC )

+

 /* default worker retry timeout in seconds */

 #define PROXY_WORKER_DEFAULT_RETRY    60

@@ -341,6 +346,7 @@ typedef struct {

     char      route[PROXY_WORKER_MAX_ROUTE_SIZE];     /* balancing route */

     char      redirect[PROXY_WORKER_MAX_ROUTE_SIZE];  /* temporary balancing redirection route */

     char      flusher[PROXY_WORKER_MAX_SCHEME_SIZE];  /* flush provider used by mod_proxy_fdpass */

+    char      uds_path[PROXY_WORKER_MAX_NAME_SIZE];   /* path to worker's unix domain socket if applicable */

     int             lbset;      /* load balancer cluster set */

     int             retries;    /* number of retries on this worker */

     int             lbstatus;   /* Current lbstatus */

@@ -387,6 +393,7 @@ typedef struct {

     unsigned int     keepalive_set:1;

     unsigned int     disablereuse_set:1;

     unsigned int     was_malloced:1;

+    unsigned int     is_name_matchable:1;

 } proxy_worker_shared;

 #define ALIGNED_PROXY_WORKER_SHARED_SIZE (APR_ALIGN_DEFAULT(sizeof(proxy_worker_shared)))

@@ -586,6 +593,16 @@ typedef __declspec(dllimport) const char *

 /* Connection pool API */

 /**

+ * Return the user-land, UDS aware worker name

+ * @param p        memory pool used for displaying worker name

+ * @param worker   the worker

+ * @return         name

+ */

+

+PROXY_DECLARE(char *) ap_proxy_worker_name(apr_pool_t *p,

+                                           proxy_worker *worker);

+

+/**

  * Get the worker from proxy configuration

  * @param p        memory pool used for finding worker

  * @param balancer the balancer that the worker belongs to

@@ -615,6 +632,24 @@ PROXY_DECLARE(char *) ap_proxy_define_worker(apr_pool_t *p,

                                              int do_malloc);

 /**

+ * Define and Allocate space for the ap_strcmp_match()able worker to proxy

+ * configuration.

+ * @param p         memory pool to allocate worker from

+ * @param worker    the new worker

+ * @param balancer  the balancer that the worker belongs to

+ * @param conf      current proxy server configuration

+ * @param url       url containing worker name (produces match pattern)

+ * @param do_malloc true if shared struct should be malloced

+ * @return          error message or NULL if successful (*worker is new worker)

+ */

+PROXY_DECLARE(char *) ap_proxy_define_match_worker(apr_pool_t *p,

+                                             proxy_worker **worker,

+                                             proxy_balancer *balancer,

+                                             proxy_server_conf *conf,

+                                             const char *url,

+                                             int do_malloc);

+

+/**

  * Share a defined proxy worker via shm

  * @param worker  worker to be shared

  * @param shm     location of shared info

@@ -983,6 +1018,13 @@ APR_DECLARE_OPTIONAL_FN(int, ap_proxy_clear_connection,

  */

 int ap_proxy_lb_workers(void);

+/**

+ * Return the port number of a known scheme (eg: http -> 80).

+ * @param scheme        scheme to test

+ * @return              port number or 0 if unknown

+ */

+PROXY_DECLARE(apr_port_t) ap_proxy_port_of_scheme(const char *scheme);

+

 extern module PROXY_DECLARE_DATA proxy_module;

 #endif /*MOD_PROXY_H*/

diff --git a/modules/proxy/mod_proxy_ajp.c b/modules/proxy/mod_proxy_ajp.c

index 3736156..cf52a7d 100644

--- a/modules/proxy/mod_proxy_ajp.c

+++ b/modules/proxy/mod_proxy_ajp.c

@@ -32,7 +32,7 @@ static int proxy_ajp_canon(request_rec *r, char *url)

     char *host, *path, sport[7];

     char *search = NULL;

     const char *err;

-    apr_port_t port = AJP13_DEF_PORT;

+    apr_port_t port, def_port;

     /* ap_port_of_scheme() */

     if (strncasecmp(url, "ajp:", 4) == 0) {

@@ -48,6 +48,8 @@ static int proxy_ajp_canon(request_rec *r, char *url)

      * do syntactic check.

      * We break the URL into host, port, path, search

      */

+    port = def_port = ap_proxy_port_of_scheme("ajp");

+

     err = ap_proxy_canon_netloc(r->pool, &url, NULL, NULL, &host, &port);

     if (err) {

         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00867) "error parsing URL %s: %s",

@@ -71,7 +73,10 @@ static int proxy_ajp_canon(request_rec *r, char *url)

     if (path == NULL)

         return HTTP_BAD_REQUEST;

-    apr_snprintf(sport, sizeof(sport), ":%d", port);

+    if (port != def_port)

+         apr_snprintf(sport, sizeof(sport), ":%d", port);

+    else

+         sport[0] = '\0';

     if (ap_strchr_c(host, ':')) {

         /* if literal IPv6 address */

diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c

index 0f45be7..514b8d8 100644

--- a/modules/proxy/mod_proxy_balancer.c

+++ b/modules/proxy/mod_proxy_balancer.c

@@ -118,7 +118,8 @@ static void init_balancer_members(apr_pool_t *p, server_rec *s,

         int worker_is_initialized;

         proxy_worker *worker = *workers;

         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01158)

-                     "Looking at %s -> %s initialized?", balancer->s->name, worker->s->name);

+                     "Looking at %s -> %s initialized?", balancer->s->name,

+                     ap_proxy_worker_name(p, worker));

         worker_is_initialized = PROXY_WORKER_IS_INITIALIZED(worker);

         if (!worker_is_initialized) {

             ap_proxy_initialize_worker(worker, s, p);

@@ -638,10 +639,11 @@ static int proxy_balancer_post_request(proxy_worker *worker,

             int val = ((int *)balancer->errstatuses->elts)[i];

             if (r->status == val) {

                 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01174)

-                              "%s: Forcing worker (%s) into error state " 

+                              "%s: Forcing worker (%s) into error state "

                               "due to status code %d matching 'failonstatus' "

                               "balancer parameter",

-                              balancer->s->name, worker->s->name, val);

+                              balancer->s->name, ap_proxy_worker_name(r->pool, worker),

+                              val);

                 worker->s->status |= PROXY_WORKER_IN_ERROR;

                 worker->s->error_time = apr_time_now();

                 break;

@@ -654,7 +656,7 @@ static int proxy_balancer_post_request(proxy_worker *worker,

         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02460)

                       "%s: Forcing worker (%s) into error state "

                       "due to timeout and 'failonstatus' parameter being set",

-                       balancer->s->name, worker->s->name);

+                       balancer->s->name, ap_proxy_worker_name(r->pool, worker));

         worker->s->status |= PROXY_WORKER_IN_ERROR;

         worker->s->error_time = apr_time_now();

@@ -1282,7 +1284,7 @@ static int balancer_handler(request_rec *r)

                 worker = *workers;

                 /* Start proxy_worker */

                 ap_rputs("        <httpd:worker>\n", r);

-                ap_rvputs(r, "          <httpd:name>", worker->s->name,

+                ap_rvputs(r, "          <httpd:name>", ap_proxy_worker_name(r->pool, worker),

                           "</httpd:name>\n", NULL);

                 ap_rvputs(r, "          <httpd:scheme>", worker->s->scheme,

                           "</httpd:scheme>\n", NULL);

@@ -1524,7 +1526,8 @@ static int balancer_handler(request_rec *r)

                           ap_escape_uri(r->pool, worker->s->name),

                           "&nonce=", balancer->s->nonce,

                           "\">", NULL);

-                ap_rvputs(r, worker->s->name, "", NULL);

+                ap_rvputs(r, (*worker->s->uds_path ? "" : ""), ap_proxy_worker_name(r->pool, worker),

+                          (*worker->s->uds_path ? "" : ""), "", NULL);

                 ap_rvputs(r, "", ap_escape_html(r->pool, worker->s->route),

                           NULL);

                 ap_rvputs(r, "",

@@ -1549,7 +1552,7 @@ static int balancer_handler(request_rec *r)

         ap_rputs("
\n", r);

         if (wsel && bsel) {

             ap_rputs("
Edit worker settings for ", r);

-            ap_rvputs(r, wsel->s->name, "\n", NULL);

+            ap_rvputs(r, (*wsel->s->uds_path?"":""), ap_proxy_worker_name(r->pool, wsel), (*wsel->s->uds_path?"":""), "\n", NULL);

             ap_rputs("

             ap_rvputs(r, ap_escape_uri(r->pool, action), "\">\n", NULL);

             ap_rputs("
\n
Load factor:

diff --git a/modules/proxy/mod_proxy_fcgi.c b/modules/proxy/mod_proxy_fcgi.c

index 0f84416..d5ca1fa 100644

--- a/modules/proxy/mod_proxy_fcgi.c

+++ b/modules/proxy/mod_proxy_fcgi.c

@@ -77,7 +77,7 @@ static int proxy_fcgi_canon(request_rec *r, char *url)

 {

     char *host, sport[7];

     const char *err, *path;

-    apr_port_t port = 8000;

+    apr_port_t port, def_port;

     if (strncasecmp(url, "fcgi:", 5) == 0) {

         url += 5;

@@ -86,9 +86,10 @@ static int proxy_fcgi_canon(request_rec *r, char *url)

         return DECLINED;

     }

+    port = def_port = ap_proxy_port_of_scheme("fcgi");

+

     ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r,

                  "canonicalising URL %s", url);

-

     err = ap_proxy_canon_netloc(r->pool, &url, NULL, NULL, &host, &port);

     if (err) {

         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01059)

@@ -96,7 +97,10 @@ static int proxy_fcgi_canon(request_rec *r, char *url)

         return HTTP_BAD_REQUEST;

     }

-    apr_snprintf(sport, sizeof(sport), ":%d", port);

+    if (port != def_port)

+        apr_snprintf(sport, sizeof(sport), ":%d", port);

+    else

+        sport[0] = '\0';

     if (ap_strchr_c(host, ':')) {

         /* if literal IPv6 address */

@@ -930,7 +934,7 @@ static int proxy_fcgi_handler(request_rec *r, proxy_worker *worker,

     int status;

     char server_portstr[32];

     conn_rec *origin = NULL;

-    proxy_conn_rec *backend = NULL;

+    proxy_conn_rec *backend;

     proxy_dir_conf *dconf = ap_get_module_config(r->per_dir_config,

                                                  &proxy_module);

@@ -943,10 +947,7 @@ static int proxy_fcgi_handler(request_rec *r, proxy_worker *worker,

                   "url: %s proxyname: %s proxyport: %d",

                  url, proxyname, proxyport);

-    if (strncasecmp(url, "fcgi:", 5) == 0) {

-        url += 5;

-    }

-    else {

+    if (strncasecmp(url, "fcgi:", 5) != 0) {

         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01077) "declining URL %s", url);

         return DECLINED;

     }

@@ -954,16 +955,14 @@ static int proxy_fcgi_handler(request_rec *r, proxy_worker *worker,

     ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01078) "serving URL %s", url);

     /* Create space for state information */

-    if (! backend) {

-        status = ap_proxy_acquire_connection(FCGI_SCHEME, &backend, worker,

-                                             r->server);

-        if (status != OK) {

-            if (backend) {

-                backend->close = 1;

-                ap_proxy_release_connection(FCGI_SCHEME, backend, r->server);

-            }

-            return status;

+    status = ap_proxy_acquire_connection(FCGI_SCHEME, &backend, worker,

+                                         r->server);

+    if (status != OK) {

+        if (backend) {

+            backend->close = 1;

+            ap_proxy_release_connection(FCGI_SCHEME, backend, r->server);

         }

+        return status;

     }

     backend->is_ssl = 0;

diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c

index 05f33b4..f0bb0ed 100644

--- a/modules/proxy/mod_proxy_http.c

+++ b/modules/proxy/mod_proxy_http.c

@@ -54,7 +54,7 @@ static int proxy_http_canon(request_rec *r, char *url)

     else {

         return DECLINED;

     }

-    def_port = apr_uri_port_of_scheme(scheme);

+    port = def_port = ap_proxy_port_of_scheme(scheme);

     ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r,

                   "HTTP: canonicalising URL %s", url);

@@ -62,7 +62,6 @@ static int proxy_http_canon(request_rec *r, char *url)

     /* do syntatic check.

      * We break the URL into host, port, path, search

      */

-    port = def_port;

     err = ap_proxy_canon_netloc(r->pool, &url, NULL, NULL, &host, &port);

     if (err) {

         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01083)

diff --git a/modules/proxy/mod_proxy_scgi.c b/modules/proxy/mod_proxy_scgi.c

index f77a986..6deae78 100644

--- a/modules/proxy/mod_proxy_scgi.c

+++ b/modules/proxy/mod_proxy_scgi.c

@@ -176,13 +176,15 @@ static int scgi_canon(request_rec *r, char *url)

 {

     char *host, sport[sizeof(":65535")];

     const char *err, *path;

-    apr_port_t port = SCGI_DEFAULT_PORT;

+    apr_port_t port, def_port;

     if (strncasecmp(url, SCHEME "://", sizeof(SCHEME) + 2)) {

         return DECLINED;

     }

     url += sizeof(SCHEME); /* Keep slashes */

+    port = def_port = SCGI_DEFAULT_PORT;

+

     err = ap_proxy_canon_netloc(r->pool, &url, NULL, NULL, &host, &port);

     if (err) {

         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00857)

@@ -190,7 +192,12 @@ static int scgi_canon(request_rec *r, char *url)

         return HTTP_BAD_REQUEST;

     }

-    apr_snprintf(sport, sizeof(sport), ":%u", port);

+    if (port != def_port) {

+        apr_snprintf(sport, sizeof(sport), ":%u", port);

+    }

+    else {

+        sport[0] = '\0';

+    }

     if (ap_strchr(host, ':')) { /* if literal IPv6 address */

         host = apr_pstrcat(r->pool, "[", host, "]", NULL);

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c

index 8bc9fab..dea2b10 100644

--- a/modules/proxy/proxy_util.c

+++ b/modules/proxy/proxy_util.c

@@ -21,6 +21,7 @@

 #include "apr_version.h"

 #include "apr_hash.h"

 #include "proxy_util.h"

+#include "ajp.h"

 #if APR_HAVE_UNISTD_H

 #include <unistd.h>         /* for getpid() */

@@ -31,6 +32,13 @@

 #define apr_socket_create apr_socket_create_ex

 #endif

+#if APR_HAVE_SYS_UN_H

+#include <sys/un.h>

+#endif

+#if (APR_MAJOR_VERSION < 2)

+#include "apr_support.h"        /* for apr_wait_for_io_or_timeout() */

+#endif

+

 APLOG_USE_MODULE(proxy);

 /*

@@ -86,14 +94,20 @@ PROXY_DECLARE(apr_status_t) ap_proxy_strncpy(char *dst, const char *src,

     char *thenil;

     apr_size_t thelen;

+    /* special case handling */

+    if (!dlen) {

+        /* XXX: APR_ENOSPACE would be better */

+        return APR_EGENERAL;

+    }

+    if (!src) {

+        *dst = '\0';

+        return APR_SUCCESS;

+    }

     thenil = apr_cpystrn(dst, src, dlen);

     thelen = thenil - dst;

-    /* Assume the typical case is smaller copying into bigger

-       so we have a fast return */

-    if ((thelen < dlen-1) || ((strlen(src)) == thelen)) {

+    if (src[thelen] == '\0') {

         return APR_SUCCESS;

     }

-    /* XXX: APR_ENOSPACE would be better */

     return APR_EGENERAL;

 }

@@ -1218,11 +1232,11 @@ PROXY_DECLARE(apr_status_t) ap_proxy_share_balancer(proxy_balancer *balancer,

     } else {

         action = "re-using";

     }

+    balancer->s = shm;

+    balancer->s->index = i;

     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(02337)

                  "%s shm[%d] (0x%pp) for %s", action, i, (void *)shm,

                  balancer->s->name);

-    balancer->s = shm;

-    balancer->s->index = i;

     /* the below should always succeed */

     lbmethod = ap_lookup_provider(PROXY_LBMETHOD, balancer->s->lbpname, "0");

     if (lbmethod) {

@@ -1356,7 +1370,7 @@ static apr_status_t connection_cleanup(void *theconn)

         ap_log_perror(APLOG_MARK, APLOG_ERR, 0, conn->pool, APLOGNO(00923)

                       "Pooled connection 0x%pp for worker %s has been"

                       " already returned to the connection pool.", conn,

-                      worker->s->name);

+                      ap_proxy_worker_name(conn->pool, worker));

         return APR_SUCCESS;

     }

@@ -1480,6 +1494,55 @@ static apr_status_t connection_destructor(void *resource, void *params,

  * WORKER related...

  */

+PROXY_DECLARE(char *) ap_proxy_worker_name(apr_pool_t *p,

+                                           proxy_worker *worker)

+{

+    if (!(*worker->s->uds_path) || !p) {

+        /* just in case */

+        return worker->s->name;

+    }

+    return apr_pstrcat(p, "unix:", worker->s->uds_path, "|", worker->s->name, NULL);

+}

+

+/*

+ * Taken from ap_strcmp_match() :

+ * Match = 0, NoMatch = 1, Abort = -1, Inval = -2

+ * Based loosely on sections of wildmat.c by Rich Salz

+ * Hmmm... shouldn't this really go component by component?

+ *

+ * Adds handling of the "\<any>" => "<any>" unescaping.

+ */

+static int ap_proxy_strcmp_ematch(const char *str, const char *expected)

+{

+    apr_size_t x, y;

+

+    for (x = 0, y = 0; expected[y]; ++y, ++x) {

+        if ((!str[x]) && (expected[y] != '$' || !apr_isdigit(expected[y + 1])))

+            return -1;

+        if (expected[y] == '$' && apr_isdigit(expected[y + 1])) {

+            while (expected[y] == '$' && apr_isdigit(expected[y + 1]))

+                y += 2;

+            if (!expected[y])

+                return 0;

+            while (str[x]) {

+                int ret;

+                if ((ret = ap_proxy_strcmp_ematch(&str[x++], &expected[y])) != 1)

+                    return ret;

+            }

+            return -1;

+        }

+        else if (expected[y] == '\\') {

+            /* NUL is an invalid char! */

+            if (!expected[++y])

+                return -2;

+        }

+        if (str[x] != expected[y])

+            return 1;

+    }

+    /* We got all the way through the worker path without a difference */

+    return 0;

+}

+

 PROXY_DECLARE(proxy_worker *) ap_proxy_get_worker(apr_pool_t *p,

                                                   proxy_balancer *balancer,

                                                   proxy_server_conf *conf,

@@ -1495,6 +1558,10 @@ PROXY_DECLARE(proxy_worker *) ap_proxy_get_worker(apr_pool_t *p,

     char *url_copy;

     int i;

+    if (!url) {

+        return NULL;

+    }

+

     c = ap_strchr_c(url, ':');

     if (c == NULL || c[1] != '/' || c[2] != '/' || c[3] == '\0') {

         return NULL;

@@ -1536,11 +1603,15 @@ PROXY_DECLARE(proxy_worker *) ap_proxy_get_worker(apr_pool_t *p,

             if ( ((worker_name_length = strlen(worker->s->name)) <= url_length)

                 && (worker_name_length >= min_match)

                 && (worker_name_length > max_match)

-                && (strncmp(url_copy, worker->s->name, worker_name_length) == 0) ) {

+                && (worker->s->is_name_matchable

+                    || strncmp(url_copy, worker->s->name,