From 7ec0ceeda8b5469fea65fc0fa95fd2d73ee7a1f8 Mon Sep 17 00:00:00 2001
From: Martin Kraemer <martin@apache.org>
Date: Mon, 28 Jan 2002 16:54:05 +0000
Subject: [PATCH] First step: send proxy_ftp.c thru   indent | pr -e8 -t (no
 other changes)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93059 13f79535-47bb-0310-9956-ffa450edef68
---
 modules/proxy/proxy_ftp.c | 2015 +++++++++++++++++++------------------
 1 file changed, 1009 insertions(+), 1006 deletions(-)

diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index 34e16c3179..234b41177a 100644
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -65,11 +65,11 @@
 module AP_MODULE_DECLARE_DATA proxy_ftp_module;
 
 int ap_proxy_ftp_canon(request_rec *r, char *url);
-int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf, 
-                         char *url, const char *proxyhost, 
-                         apr_port_t proxyport);
-apr_status_t ap_proxy_send_dir_filter(ap_filter_t *f,
-				      apr_bucket_brigade *bb);
+int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
+                             char *url, const char *proxyhost,
+                             apr_port_t proxyport);
+apr_status_t ap_proxy_send_dir_filter(ap_filter_t * f,
+                                                   apr_bucket_brigade * bb);
 
 
 /*
@@ -80,15 +80,15 @@ static int decodeenc(char *x)
     int i, j, ch;
 
     if (x[0] == '\0')
-	return 0;		/* special case for no characters */
+        return 0;               /* special case for no characters */
     for (i = 0, j = 0; x[i] != '\0'; i++, j++) {
         /* decode it if not already done */
-	ch = x[i];
-	if (ch == '%' && ap_isxdigit(x[i + 1]) && ap_isxdigit(x[i + 2])) {
-	    ch = ap_proxy_hex2c(&x[i + 1]);
-	    i += 2;
-	}
-	x[j] = ch;
+        ch = x[i];
+        if (ch == '%' && ap_isxdigit(x[i + 1]) && ap_isxdigit(x[i + 2])) {
+            ch = ap_proxy_hex2c(&x[i + 1]);
+            i += 2;
+        }
+        x[j] = ch;
     }
     x[j] = '\0';
     return j;
@@ -103,17 +103,17 @@ static int ftp_check_string(const char *x)
     int i, ch = 0;
 
     for (i = 0; x[i] != '\0'; i++) {
-	ch = x[i];
-	if (ch == '%' && ap_isxdigit(x[i + 1]) && ap_isxdigit(x[i + 2])) {
-	    ch = ap_proxy_hex2c(&x[i + 1]);
-	    i += 2;
-	}
+        ch = x[i];
+        if (ch == '%' && ap_isxdigit(x[i + 1]) && ap_isxdigit(x[i + 2])) {
+            ch = ap_proxy_hex2c(&x[i + 1]);
+            i += 2;
+        }
 #if !APR_CHARSET_EBCDIC
         if (ch == '\015' || ch == '\012' || (ch & 0x80))
-#else /*APR_CHARSET_EBCDIC*/
+#else                           /* APR_CHARSET_EBCDIC */
         if (ch == '\r' || ch == '\n' || (os_toascii[ch] & 0x80))
-#endif /*APR_CHARSET_EBCDIC*/
-        return 0;
+#endif                          /* APR_CHARSET_EBCDIC */
+            return 0;
     }
     return 1;
 }
@@ -130,76 +130,76 @@ int ap_proxy_ftp_canon(request_rec *r, char *url)
 
     /* */
     if (strncasecmp(url, "ftp:", 4) == 0) {
-	url += 4;
+        url += 4;
     }
     else {
-	return DECLINED;
+        return DECLINED;
     }
     def_port = apr_uri_default_port_for_scheme("ftp");
 
-    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		 "proxy: FTP: canonicalising URL %s", url);
+    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                 "proxy: FTP: canonicalising URL %s", url);
 
     port = def_port;
     err = ap_proxy_canon_netloc(p, &url, &user, &password, &host, &port);
     if (err)
-	return HTTP_BAD_REQUEST;
+        return HTTP_BAD_REQUEST;
     if (user != NULL && !ftp_check_string(user))
-	return HTTP_BAD_REQUEST;
+        return HTTP_BAD_REQUEST;
     if (password != NULL && !ftp_check_string(password))
-	return HTTP_BAD_REQUEST;
+        return HTTP_BAD_REQUEST;
 
     /* now parse path/parameters args, according to rfc1738 */
-    /* N.B. if this isn't a true proxy request, then the URL path
-     * (but not query args) has already been decoded.
-     * This gives rise to the problem of a ; being decoded into the
-     * path.
+    /*
+     * N.B. if this isn't a true proxy request, then the URL path (but not
+     * query args) has already been decoded. This gives rise to the problem
+     * of a ; being decoded into the path.
      */
     strp = strchr(url, ';');
     if (strp != NULL) {
-	*(strp++) = '\0';
-	parms = ap_proxy_canonenc(p, strp, strlen(strp), enc_parm,
-				  r->proxyreq);
-	if (parms == NULL)
-	    return HTTP_BAD_REQUEST;
+        *(strp++) = '\0';
+        parms = ap_proxy_canonenc(p, strp, strlen(strp), enc_parm,
+                                  r->proxyreq);
+        if (parms == NULL)
+            return HTTP_BAD_REQUEST;
     }
     else
-	parms = "";
+        parms = "";
 
     path = ap_proxy_canonenc(p, url, strlen(url), enc_path, r->proxyreq);
     if (path == NULL)
-	return HTTP_BAD_REQUEST;
+        return HTTP_BAD_REQUEST;
     if (!ftp_check_string(path))
-	return HTTP_BAD_REQUEST;
+        return HTTP_BAD_REQUEST;
 
     if (r->proxyreq && r->args != NULL) {
-	if (strp != NULL) {
-	    strp = ap_proxy_canonenc(p, r->args, strlen(r->args), enc_parm, 1);
-	    if (strp == NULL)
-		return HTTP_BAD_REQUEST;
-	    parms = apr_pstrcat(p, parms, "?", strp, NULL);
-	}
-	else {
-	    strp = ap_proxy_canonenc(p, r->args, strlen(r->args), enc_fpath, 1);
-	    if (strp == NULL)
-		return HTTP_BAD_REQUEST;
-	    path = apr_pstrcat(p, path, "?", strp, NULL);
-	}
-	r->args = NULL;
+        if (strp != NULL) {
+            strp = ap_proxy_canonenc(p, r->args, strlen(r->args), enc_parm, 1);
+            if (strp == NULL)
+                return HTTP_BAD_REQUEST;
+            parms = apr_pstrcat(p, parms, "?", strp, NULL);
+        }
+        else {
+            strp = ap_proxy_canonenc(p, r->args, strlen(r->args), enc_fpath, 1);
+            if (strp == NULL)
+                return HTTP_BAD_REQUEST;
+            path = apr_pstrcat(p, path, "?", strp, NULL);
+        }
+        r->args = NULL;
     }
 
 /* now, rebuild URL */
 
     if (port != def_port)
-	apr_snprintf(sport, sizeof(sport), ":%d", port);
+        apr_snprintf(sport, sizeof(sport), ":%d", port);
     else
-	sport[0] = '\0';
+        sport[0] = '\0';
 
     r->filename = apr_pstrcat(p, "proxy:ftp://", (user != NULL) ? user : "",
-			       (password != NULL) ? ":" : "",
-			       (password != NULL) ? password : "",
-		          (user != NULL) ? "@" : "", host, sport, "/", path,
-			       (parms[0] != '\0') ? ";" : "", parms, NULL);
+                              (password != NULL) ? ":" : "",
+                              (password != NULL) ? password : "",
+                          (user != NULL) ? "@" : "", host, sport, "/", path,
+                              (parms[0] != '\0') ? ";" : "", parms, NULL);
 
     return OK;
 }
@@ -208,39 +208,38 @@ int ap_proxy_ftp_canon(request_rec *r, char *url)
 #define MAX_LINE_LEN 80
 
 /*
- * Reads response lines, returns both the ftp status code and 
+ * Reads response lines, returns both the ftp status code and
  * remembers the response message in the supplied buffer
  */
-static int ftp_getrc_msg(conn_rec *c, apr_bucket_brigade *bb, char *msgbuf, int msglen)
+static int ftp_getrc_msg(conn_rec *c, apr_bucket_brigade * bb, char *msgbuf, int msglen)
 {
     int status;
     char response[MAX_LINE_LEN];
     char buff[5];
-    char *mb = msgbuf,
-	 *me = &msgbuf[msglen];
+    char *mb = msgbuf, *me = &msgbuf[msglen];
     apr_status_t rv;
     int eos;
 
     if (APR_SUCCESS != (rv = ap_proxy_string_read(c, bb, response, sizeof(response), &eos))) {
-	return -1;
+        return -1;
     }
     if (!apr_isdigit(response[0]) || !apr_isdigit(response[1]) ||
-	!apr_isdigit(response[2]) || (response[3] != ' ' && response[3] != '-'))
-	status = 0;
+    !apr_isdigit(response[2]) || (response[3] != ' ' && response[3] != '-'))
+        status = 0;
     else
-	status = 100 * response[0] + 10 * response[1] + response[2] - 111 * '0';
+        status = 100 * response[0] + 10 * response[1] + response[2] - 111 * '0';
 
-    mb = apr_cpystrn(mb, response+4, me - mb);
+    mb = apr_cpystrn(mb, response + 4, me - mb);
 
     if (response[3] == '-') {
-	memcpy(buff, response, 3);
-	buff[3] = ' ';
-	do {
-	    if (APR_SUCCESS != (rv = ap_proxy_string_read(c, bb, response, sizeof(response), &eos))) {
-		return -1;
-	    }
-	    mb = apr_cpystrn(mb, response + (' ' == response[0] ? 1 : 4), me - mb);
-	} while (memcmp(response, buff, 4) != 0);
+        memcpy(buff, response, 3);
+        buff[3] = ' ';
+        do {
+            if (APR_SUCCESS != (rv = ap_proxy_string_read(c, bb, response, sizeof(response), &eos))) {
+                return -1;
+            }
+            mb = apr_cpystrn(mb, response + (' ' == response[0] ? 1 : 4), me - mb);
+        } while (memcmp(response, buff, 4) != 0);
     }
 
     return status;
@@ -258,10 +257,12 @@ static int ftp_getrc_msg(conn_rec *c, apr_bucket_brigade *bb, char *msgbuf, int
 typedef struct {
     apr_bucket_brigade *in;
     char buffer[MAX_STRING_LEN];
-    enum {HEADER, BODY, FOOTER} state;
-} proxy_dir_ctx_t;
+    enum {
+        HEADER, BODY, FOOTER
+    }    state;
+}      proxy_dir_ctx_t;
 
-apr_status_t ap_proxy_send_dir_filter(ap_filter_t *f, apr_bucket_brigade *in)
+apr_status_t ap_proxy_send_dir_filter(ap_filter_t * f, apr_bucket_brigade * in)
 {
     request_rec *r = f->r;
     apr_pool_t *p = r->pool;
@@ -277,10 +278,10 @@ apr_status_t ap_proxy_send_dir_filter(ap_filter_t *f, apr_bucket_brigade *in)
 
     proxy_dir_ctx_t *ctx = f->ctx;
     if (!ctx) {
-	f->ctx = ctx = apr_pcalloc(p, sizeof(*ctx));
-	ctx->in = apr_brigade_create(p);
-	ctx->buffer[0] = 0;
-	ctx->state = HEADER;
+        f->ctx = ctx = apr_pcalloc(p, sizeof(*ctx));
+        ctx->in = apr_brigade_create(p);
+        ctx->buffer[0] = 0;
+        ctx->state = HEADER;
     }
 
     /* combine the stored and the new */
@@ -288,207 +289,207 @@ apr_status_t ap_proxy_send_dir_filter(ap_filter_t *f, apr_bucket_brigade *in)
 
     if (HEADER == ctx->state) {
 
-	/* Save "scheme://site" prefix without password */
-	site = apr_uri_unparse(p, &f->r->parsed_uri, APR_URI_UNP_OMITPASSWORD|APR_URI_UNP_OMITPATHINFO);
-	/* ... and path without query args */
-	path = apr_uri_unparse(p, &f->r->parsed_uri, APR_URI_UNP_OMITSITEPART|APR_URI_UNP_OMITQUERY);
-	(void)decodeenc(path);
-
-	/* Copy path, strip (all except the last) trailing slashes */
-	path = dir = apr_pstrcat(p, path, "/", NULL);
-	while ((n = strlen(path)) > 1 && path[n-1] == '/' && path[n-2] == '/')
-	    path[n-1] = '\0';
-
-	/* print "ftp://host/" */
-	str = apr_psprintf(p, DOCTYPE_HTML_3_2
-			"\n\n<HTML>\n<HEAD>\n<TITLE>%s%s</TITLE>\n"
-			"<BASE HREF=\"%s%s\">\n</HEAD>\n\n"
-			"<BODY>\n\n<H2>Directory of "
-			"<A HREF=\"/\">%s</A>/",
-			site, path, site, path, site);
-
-	e = apr_bucket_pool_create(str, strlen(str), p);
-	APR_BRIGADE_INSERT_TAIL(out, e);
-
-	while ((dir = strchr(dir+1, '/')) != NULL)
-	{
-	    *dir = '\0';
-	    if ((reldir = strrchr(path+1, '/'))==NULL)
-		reldir = path+1;
-	    else
-		++reldir;
-	    /* print "path/" component */
-	    str = apr_psprintf(p, "<A HREF=\"/%s/\">%s</A>/", path+1, reldir);
-	    e = apr_bucket_pool_create(str, strlen(str), p);
-	    APR_BRIGADE_INSERT_TAIL(out, e);
-	    *dir = '/';
-	}
-	/* If the caller has determined the current directory, and it differs */
-	/* from what the client requested, then show the real name */
-	if (pwd == NULL || strncmp (pwd, path, strlen(pwd)) == 0) {
-	    str = apr_psprintf(p, "</H2>\n\n<HR></HR>\n\n<PRE>");
-	} else {
-	    str = apr_psprintf(p, "</H2>\n\n(%s)\n\n<HR></HR>\n\n<PRE>", pwd);
-	}
-	e = apr_bucket_pool_create(str, strlen(str), p);
-	APR_BRIGADE_INSERT_TAIL(out, e);
-
-	/* print README */
-	if (readme) {
-	    str = apr_psprintf(p, "%s\n</PRE>\n\n<HR></HR>\n\n<PRE>\n",
-			     readme);
-
-	    e = apr_bucket_pool_create(str, strlen(str), p);
-	    APR_BRIGADE_INSERT_TAIL(out, e);
-	}
-
-	/* make sure page intro gets sent out */
-	e = apr_bucket_flush_create();
-	APR_BRIGADE_INSERT_TAIL(out, e);
-	if (APR_SUCCESS != (rv = ap_pass_brigade(f->next, out))) {
-	    return rv;
-	}
-	apr_brigade_cleanup(out);
-
-	ctx->state = BODY;
+        /* Save "scheme://site" prefix without password */
+        site = apr_uri_unparse(p, &f->r->parsed_uri, APR_URI_UNP_OMITPASSWORD | APR_URI_UNP_OMITPATHINFO);
+        /* ... and path without query args */
+        path = apr_uri_unparse(p, &f->r->parsed_uri, APR_URI_UNP_OMITSITEPART | APR_URI_UNP_OMITQUERY);
+        (void)decodeenc(path);
+
+        /* Copy path, strip (all except the last) trailing slashes */
+        path = dir = apr_pstrcat(p, path, "/", NULL);
+        while ((n = strlen(path)) > 1 && path[n - 1] == '/' && path[n - 2] == '/')
+            path[n - 1] = '\0';
+
+        /* print "ftp://host/" */
+        str = apr_psprintf(p, DOCTYPE_HTML_3_2
+                           "\n\n<HTML>\n<HEAD>\n<TITLE>%s%s</TITLE>\n"
+                           "<BASE HREF=\"%s%s\">\n</HEAD>\n\n"
+                           "<BODY>\n\n<H2>Directory of "
+                           "<A HREF=\"/\">%s</A>/",
+                           site, path, site, path, site);
+
+        e = apr_bucket_pool_create(str, strlen(str), p);
+        APR_BRIGADE_INSERT_TAIL(out, e);
+
+        while ((dir = strchr(dir + 1, '/')) != NULL) {
+            *dir = '\0';
+            if ((reldir = strrchr(path + 1, '/')) == NULL)
+                reldir = path + 1;
+            else
+                ++reldir;
+            /* print "path/" component */
+            str = apr_psprintf(p, "<A HREF=\"/%s/\">%s</A>/", path + 1, reldir);
+            e = apr_bucket_pool_create(str, strlen(str), p);
+            APR_BRIGADE_INSERT_TAIL(out, e);
+            *dir = '/';
+        }
+        /* If the caller has determined the current directory, and it differs */
+        /* from what the client requested, then show the real name */
+        if (pwd == NULL || strncmp(pwd, path, strlen(pwd)) == 0) {
+            str = apr_psprintf(p, "</H2>\n\n<HR></HR>\n\n<PRE>");
+        }
+        else {
+            str = apr_psprintf(p, "</H2>\n\n(%s)\n\n<HR></HR>\n\n<PRE>", pwd);
+        }
+        e = apr_bucket_pool_create(str, strlen(str), p);
+        APR_BRIGADE_INSERT_TAIL(out, e);
+
+        /* print README */
+        if (readme) {
+            str = apr_psprintf(p, "%s\n</PRE>\n\n<HR></HR>\n\n<PRE>\n",
+                               readme);
+
+            e = apr_bucket_pool_create(str, strlen(str), p);
+            APR_BRIGADE_INSERT_TAIL(out, e);
+        }
+
+        /* make sure page intro gets sent out */
+        e = apr_bucket_flush_create();
+        APR_BRIGADE_INSERT_TAIL(out, e);
+        if (APR_SUCCESS != (rv = ap_pass_brigade(f->next, out))) {
+            return rv;
+        }
+        apr_brigade_cleanup(out);
+
+        ctx->state = BODY;
     }
 
     /* loop through each line of directory */
     while (BODY == ctx->state) {
-	char *filename;
-	int found = 0;
-	int eos = 0;
-
-	/* get a complete line */
-	/* if the buffer overruns - throw data away */
-	while (!found && !APR_BRIGADE_EMPTY(ctx->in)) {
-	    char *pos, *response;
-	    apr_size_t len, max;
-	    e = APR_BRIGADE_FIRST(ctx->in);
-	    if (APR_BUCKET_IS_EOS(e)) {
-		eos = 1;
-		break;
-	    }
-	    if (APR_SUCCESS != (rv = apr_bucket_read(e, (const char **)&response, &len, APR_BLOCK_READ))) {
-		return rv;
-	    }
-	    pos = memchr(response, APR_ASCII_LF, len);
-	    if (pos != NULL) {
-		if ((response + len) != (pos + 1)) {
-		    len = pos - response + 1;
-		    apr_bucket_split(e, pos - response + 1);
-		    
-		}
-		found = 1;
-	    }
-	    max = sizeof(ctx->buffer)-strlen(ctx->buffer)-1;
-	    if (len > max) {
-		len = max;
-	    }
+        char *filename;
+        int found = 0;
+        int eos = 0;
+
+        /* get a complete line */
+        /* if the buffer overruns - throw data away */
+        while (!found && !APR_BRIGADE_EMPTY(ctx->in)) {
+            char *pos, *response;
+            apr_size_t len, max;
+            e = APR_BRIGADE_FIRST(ctx->in);
+            if (APR_BUCKET_IS_EOS(e)) {
+                eos = 1;
+                break;
+            }
+            if (APR_SUCCESS != (rv = apr_bucket_read(e, (const char **)&response, &len, APR_BLOCK_READ))) {
+                return rv;
+            }
+            pos = memchr(response, APR_ASCII_LF, len);
+            if (pos != NULL) {
+                if ((response + len) != (pos + 1)) {
+                    len = pos - response + 1;
+                    apr_bucket_split(e, pos - response + 1);
+
+                }
+                found = 1;
+            }
+            max = sizeof(ctx->buffer) - strlen(ctx->buffer) - 1;
+            if (len > max) {
+                len = max;
+            }
 /* strncat works here, but apr_cpystrn does not - the last char gets chopped, dunno why */
-/*	    apr_cpystrn(ctx->buffer+strlen(ctx->buffer), response, len);*/
-	    strncat(ctx->buffer, response, len);
-	    APR_BUCKET_REMOVE(e);
-	    apr_bucket_destroy(e);
-	}
-
-	/* EOS? jump to footer */
-	if (eos) {
-	    ctx->state = FOOTER;
-	    break;
-	}
-
-	/* not complete? leave and try get some more */
-	if (!found) {
-	    return APR_SUCCESS;
-	}
-
-	/* a symlink? */
-	if (ctx->buffer[0] == 'l' && (filename=strstr(ctx->buffer, " -> ")) != NULL) {
-	    char *link_ptr = filename;
-
-	    do {
-		filename--;
-	    } while (filename[0] != ' ');
-	    *(filename++) = '\0';
-	    *(link_ptr++) = '\0';
-	    if ((n = strlen(link_ptr)) > 1 && link_ptr[n - 1] == '\n')
-	      link_ptr[n - 1] = '\0';
-	    str = apr_psprintf(p, "%s <A HREF=\"%s\">%s %s</A>\n", ctx->buffer, filename, filename, link_ptr);
-	}
-
-	/* a directory/file? */
-	else if (ctx->buffer[0] == 'd' || ctx->buffer[0] == '-' || ctx->buffer[0] == 'l' || apr_isdigit(ctx->buffer[0])) {
-	    int searchidx = 0;
-	    char *searchptr = NULL;
-	    int firstfile = 1;
-	    if (apr_isdigit(ctx->buffer[0])) {	/* handle DOS dir */
-		searchptr = strchr(ctx->buffer, '<');
-		if (searchptr != NULL)
-		    *searchptr = '[';
-		searchptr = strchr(ctx->buffer, '>');
-		if (searchptr != NULL)
-		    *searchptr = ']';
-	    }
-
-	    filename = strrchr(ctx->buffer, ' ');
-	    *(filename++) = 0;
-	    filename[strlen(filename) - 1] = 0;
-
-	    /* handle filenames with spaces in 'em */
-	    if (!strcmp(filename, ".") || !strcmp(filename, "..") || firstfile) {
-		firstfile = 0;
-		searchidx = filename - ctx->buffer;
-	    }
-	    else if (searchidx != 0 && ctx->buffer[searchidx] != 0) {
-		*(--filename) = ' ';
-		ctx->buffer[searchidx - 1] = 0;
-		filename = &ctx->buffer[searchidx];
-	    }
-
-	    /* Special handling for '.' and '..' */
-	    if (!strcmp(filename, ".") || !strcmp(filename, "..") || ctx->buffer[0] == 'd') {
-		str = apr_psprintf(p, "%s <A HREF=\"%s/\">%s</A>\n",
-		    ctx->buffer, filename, filename);
-	    }
-	    else {
-		str = apr_psprintf(p, "%s <A HREF=\"%s\">%s</A>\n",
-		    ctx->buffer, filename, filename);
-	    }
-	}
-	else {
-	    str = apr_pstrdup(p, ctx->buffer);
-	}
-
-	/* erase buffer for next time around */
-	ctx->buffer[0] = 0;
-
-	e = apr_bucket_pool_create(str, strlen(str), p);
-	APR_BRIGADE_INSERT_TAIL(out, e);
-	e = apr_bucket_flush_create();
-	APR_BRIGADE_INSERT_TAIL(out, e);
-	if (APR_SUCCESS != (rv = ap_pass_brigade(f->next, out))) {
-	    return rv;
-	}
-	apr_brigade_cleanup(out);
+/*          apr_cpystrn(ctx->buffer+strlen(ctx->buffer), response, len);*/
+            strncat(ctx->buffer, response, len);
+            APR_BUCKET_REMOVE(e);
+            apr_bucket_destroy(e);
+        }
+
+        /* EOS? jump to footer */
+        if (eos) {
+            ctx->state = FOOTER;
+            break;
+        }
+
+        /* not complete? leave and try get some more */
+        if (!found) {
+            return APR_SUCCESS;
+        }
+
+        /* a symlink? */
+        if (ctx->buffer[0] == 'l' && (filename = strstr(ctx->buffer, " -> ")) != NULL) {
+            char *link_ptr = filename;
+
+            do {
+                filename--;
+            } while (filename[0] != ' ');
+            *(filename++) = '\0';
+            *(link_ptr++) = '\0';
+            if ((n = strlen(link_ptr)) > 1 && link_ptr[n - 1] == '\n')
+                link_ptr[n - 1] = '\0';
+            str = apr_psprintf(p, "%s <A HREF=\"%s\">%s %s</A>\n", ctx->buffer, filename, filename, link_ptr);
+        }
+
+        /* a directory/file? */
+        else if (ctx->buffer[0] == 'd' || ctx->buffer[0] == '-' || ctx->buffer[0] == 'l' || apr_isdigit(ctx->buffer[0])) {
+            int searchidx = 0;
+            char *searchptr = NULL;
+            int firstfile = 1;
+            if (apr_isdigit(ctx->buffer[0])) {  /* handle DOS dir */
+                searchptr = strchr(ctx->buffer, '<');
+                if (searchptr != NULL)
+                    *searchptr = '[';
+                searchptr = strchr(ctx->buffer, '>');
+                if (searchptr != NULL)
+                    *searchptr = ']';
+            }
+
+            filename = strrchr(ctx->buffer, ' ');
+            *(filename++) = 0;
+            filename[strlen(filename) - 1] = 0;
+
+            /* handle filenames with spaces in 'em */
+            if (!strcmp(filename, ".") || !strcmp(filename, "..") || firstfile) {
+                firstfile = 0;
+                searchidx = filename - ctx->buffer;
+            }
+            else if (searchidx != 0 && ctx->buffer[searchidx] != 0) {
+                *(--filename) = ' ';
+                ctx->buffer[searchidx - 1] = 0;
+                filename = &ctx->buffer[searchidx];
+            }
+
+            /* Special handling for '.' and '..' */
+            if (!strcmp(filename, ".") || !strcmp(filename, "..") || ctx->buffer[0] == 'd') {
+                str = apr_psprintf(p, "%s <A HREF=\"%s/\">%s</A>\n",
+                                   ctx->buffer, filename, filename);
+            }
+            else {
+                str = apr_psprintf(p, "%s <A HREF=\"%s\">%s</A>\n",
+                                   ctx->buffer, filename, filename);
+            }
+        }
+        else {
+            str = apr_pstrdup(p, ctx->buffer);
+        }
+
+        /* erase buffer for next time around */
+        ctx->buffer[0] = 0;
+
+        e = apr_bucket_pool_create(str, strlen(str), p);
+        APR_BRIGADE_INSERT_TAIL(out, e);
+        e = apr_bucket_flush_create();
+        APR_BRIGADE_INSERT_TAIL(out, e);
+        if (APR_SUCCESS != (rv = ap_pass_brigade(f->next, out))) {
+            return rv;
+        }
+        apr_brigade_cleanup(out);
 
     }
 
     if (FOOTER == ctx->state) {
-	str = apr_psprintf(p, "</PRE>\n\n<HR></HR>\n\n%s\n\n</BODY>\n</HTML>\n", ap_psignature("", r));
-	e = apr_bucket_pool_create(str, strlen(str), p);
-	APR_BRIGADE_INSERT_TAIL(out, e);
+        str = apr_psprintf(p, "</PRE>\n\n<HR></HR>\n\n%s\n\n</BODY>\n</HTML>\n", ap_psignature("", r));
+        e = apr_bucket_pool_create(str, strlen(str), p);
+        APR_BRIGADE_INSERT_TAIL(out, e);
 
-	e = apr_bucket_flush_create();
-	APR_BRIGADE_INSERT_TAIL(out, e);
+        e = apr_bucket_flush_create();
+        APR_BRIGADE_INSERT_TAIL(out, e);
 
-	e = apr_bucket_eos_create();
-	APR_BRIGADE_INSERT_TAIL(out, e);
+        e = apr_bucket_eos_create();
+        APR_BRIGADE_INSERT_TAIL(out, e);
 
-	if (APR_SUCCESS != (rv = ap_pass_brigade(f->next, out))) {
-	    return rv;
-	}
-	apr_brigade_destroy(out);
+        if (APR_SUCCESS != (rv = ap_pass_brigade(f->next, out))) {
+            return rv;
+        }
+        apr_brigade_destroy(out);
     }
 
     return APR_SUCCESS;
@@ -501,23 +502,24 @@ apr_status_t ap_proxy_send_dir_filter(ap_filter_t *f, apr_bucket_brigade *in)
  * Note that we "invent" a realm name which consists of the
  * ftp://user@host part of the reqest (sans password -if supplied but invalid-)
  */
-static int ftp_unauthorized (request_rec *r, int log_it)
+static int ftp_unauthorized(request_rec *r, int log_it)
 {
     r->proxyreq = PROXYREQ_NONE;
-    /* Log failed requests if they supplied a password
-     * (log username/password guessing attempts)
+    /*
+     * Log failed requests if they supplied a password (log username/password
+     * guessing attempts)
      */
     if (log_it)
-	ap_log_rerror(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, r,
-		      "proxy: missing or failed auth to %s",
-		      apr_uri_unparse(r->pool,
-		      &r->parsed_uri, APR_URI_UNP_OMITPATHINFO));
+        ap_log_rerror(APLOG_MARK, APLOG_INFO | APLOG_NOERRNO, 0, r,
+                      "proxy: missing or failed auth to %s",
+                      apr_uri_unparse(r->pool,
+                                 &r->parsed_uri, APR_URI_UNP_OMITPATHINFO));
 
     apr_table_setn(r->err_headers_out, "WWW-Authenticate",
-                  apr_pstrcat(r->pool, "Basic realm=\"",
-		  apr_uri_unparse(r->pool, &r->parsed_uri,
-		    APR_URI_UNP_OMITPASSWORD|APR_URI_UNP_OMITPATHINFO),
-		    "\"", NULL));
+                   apr_pstrcat(r->pool, "Basic realm=\"",
+                               apr_uri_unparse(r->pool, &r->parsed_uri,
+                       APR_URI_UNP_OMITPASSWORD | APR_URI_UNP_OMITPATHINFO),
+                               "\"", NULL));
 
     return HTTP_UNAUTHORIZED;
 }
@@ -530,14 +532,14 @@ static int ftp_unauthorized (request_rec *r, int log_it)
  * PASV added by Chuck
  * Filters by [Graham Leggett <minfrin@sharp.fm>]
  */
-int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf, 
-                         char *url, const char *proxyhost, 
-                         apr_port_t proxyport)
+int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
+                             char *url, const char *proxyhost,
+                             apr_port_t proxyport)
 {
     apr_pool_t *p = r->pool;
     conn_rec *c = r->connection;
     proxy_conn_rec *backend;
-    apr_socket_t *sock, *local_sock, *remote_sock=NULL;
+    apr_socket_t *sock, *local_sock, *remote_sock = NULL;
     apr_sockaddr_t *connect_addr;
     apr_status_t rv;
     conn_rec *origin, *remote;
@@ -563,114 +565,114 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
 
     /* is this for us? */
     if (proxyhost) {
-	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		     "proxy: FTP: rejecting URL %s - proxyhost %s specified:", url, proxyhost);
-	return DECLINED; /* proxy connections are via HTTP */
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                     "proxy: FTP: rejecting URL %s - proxyhost %s specified:", url, proxyhost);
+        return DECLINED;        /* proxy connections are via HTTP */
     }
     if (strncasecmp(url, "ftp:", 4)) {
-	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		     "proxy: FTP: rejecting URL %s - not ftp:", url);
-	return DECLINED; /* only interested in FTP */
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                     "proxy: FTP: rejecting URL %s - not ftp:", url);
+        return DECLINED;        /* only interested in FTP */
     }
-    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		 "proxy: FTP: serving URL %s", url);
+    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                 "proxy: FTP: serving URL %s", url);
 
     /* create space for state information */
     backend = (proxy_conn_rec *) ap_get_module_config(c->conn_config, &proxy_ftp_module);
     if (!backend) {
-	backend = ap_pcalloc(c->pool, sizeof(proxy_conn_rec));
-	backend->connection = NULL;
-	backend->hostname = NULL;
-	backend->port = 0;
-	ap_set_module_config(c->conn_config, &proxy_ftp_module, backend);
+        backend = ap_pcalloc(c->pool, sizeof(proxy_conn_rec));
+        backend->connection = NULL;
+        backend->hostname = NULL;
+        backend->port = 0;
+        ap_set_module_config(c->conn_config, &proxy_ftp_module, backend);
     }
     origin_sock = ap_get_module_config(backend->connection->conn_config, &core_module);
 
 
-    /* 
-     * I: Who Do I Connect To? 
-     * -----------------------
-     *
+    /*
+     * I: Who Do I Connect To? -----------------------
+     * 
      * Break up the URL to determine the host to connect to
      */
 
     /* we only support GET and HEAD */
     if (r->method_number != M_GET)
-	return HTTP_NOT_IMPLEMENTED;
+        return HTTP_NOT_IMPLEMENTED;
 
 
     /* We break the URL into host, port, path-search */
     connectname = r->parsed_uri.hostname;
     connectport = (r->parsed_uri.port != 0)
-	           ? r->parsed_uri.port
-	           : apr_uri_default_port_for_scheme("ftp");
+        ? r->parsed_uri.port
+        : apr_uri_default_port_for_scheme("ftp");
     path = apr_pstrdup(p, r->parsed_uri.path);
     path = (path != NULL && path[0] != '\0') ? &path[1] : "";
 
     parms = strchr(path, ';');
     if (parms != NULL)
-	*(parms++) = '\0';
-
-    /* The "Authorization:" header must be checked first.
-     * We allow the user to "override" the URL-coded user [ & password ]
-     * in the Browsers' User&Password Dialog.
-     * NOTE that this is only marginally more secure than having the
-     * password travel in plain as part of the URL, because Basic Auth
-     * simply uuencodes the plain text password. 
-     * But chances are still smaller that the URL is logged regularly.
+        *(parms++) = '\0';
+
+    /*
+     * The "Authorization:" header must be checked first. We allow the user
+     * to "override" the URL-coded user [ & password ] in the Browsers'
+     * User&Password Dialog. NOTE that this is only marginally more secure
+     * than having the password travel in plain as part of the URL, because
+     * Basic Auth simply uuencodes the plain text password. But chances are
+     * still smaller that the URL is logged regularly.
      */
     if ((password = apr_table_get(r->headers_in, "Authorization")) != NULL
-	&& strcasecmp(ap_getword(r->pool, &password, ' '), "Basic") == 0
-	&& (password = ap_pbase64decode(r->pool, password))[0] != ':') {
-	/* Note that this allocation has to be made from r->connection->pool
-	 * because it has the lifetime of the connection.  The other allocations
-	 * are temporary and can be tossed away any time.
-	 */
-	user = ap_getword_nulls (r->connection->pool, &password, ':');
-	r->ap_auth_type = "Basic";
-	r->user = r->parsed_uri.user = user;
+        && strcasecmp(ap_getword(r->pool, &password, ' '), "Basic") == 0
+        && (password = ap_pbase64decode(r->pool, password))[0] != ':') {
+        /*
+         * Note that this allocation has to be made from r->connection->pool
+         * because it has the lifetime of the connection.  The other
+         * allocations are temporary and can be tossed away any time.
+         */
+        user = ap_getword_nulls(r->connection->pool, &password, ':');
+        r->ap_auth_type = "Basic";
+        r->user = r->parsed_uri.user = user;
     }
     else if ((user = r->parsed_uri.user) != NULL) {
-	user = apr_pstrdup(p, user);
-	decodeenc(user);
-	if ((password = r->parsed_uri.password) != NULL) {
-	    char *tmp = apr_pstrdup(p, password);
-	    decodeenc(tmp);
-	    password = tmp;
-	}
+        user = apr_pstrdup(p, user);
+        decodeenc(user);
+        if ((password = r->parsed_uri.password) != NULL) {
+            char *tmp = apr_pstrdup(p, password);
+            decodeenc(tmp);
+            password = tmp;
+        }
     }
     else {
-		user = "anonymous";
-		password = "apache-proxy@";
+        user = "anonymous";
+        password = "apache-proxy@";
     }
 
-    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		 "proxy: FTP: connecting %s to %s:%d", url, connectname, connectport);
+    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+       "proxy: FTP: connecting %s to %s:%d", url, connectname, connectport);
 
     /* do a DNS lookup for the destination host */
     err = apr_sockaddr_info_get(&connect_addr, connectname, APR_UNSPEC, connectport, 0, p);
 
     /* check if ProxyBlock directive on this host */
     if (OK != ap_proxy_checkproxyblock(r, conf, connect_addr)) {
-	return ap_proxyerror(r, HTTP_FORBIDDEN,
-			     "Connect to remote machine blocked");
+        return ap_proxyerror(r, HTTP_FORBIDDEN,
+                             "Connect to remote machine blocked");
     }
 
 
     /*
-     * II: Make the Connection
-     * -----------------------
-     *
+     * II: Make the Connection -----------------------
+     * 
      * We have determined who to connect to. Now make the connection.
      */
 
-    /* get all the possible IP addresses for the destname and loop through them
-     * until we get a successful connection
+    /*
+     * get all the possible IP addresses for the destname and loop through
+     * them until we get a successful connection
      */
     if (APR_SUCCESS != err) {
-	return ap_proxyerror(r, HTTP_BAD_GATEWAY, apr_pstrcat(p,
-                             "DNS lookup failure for: ",
-                             connectname, NULL));
+        return ap_proxyerror(r, HTTP_BAD_GATEWAY, apr_pstrcat(p,
+                                                 "DNS lookup failure for: ",
+                                                        connectname, NULL));
     }
 
 
@@ -682,133 +684,132 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
 
 #if !defined(TPF) && !defined(BEOS)
     if (conf->recv_buffer_size > 0
-	&& (rv = apr_setsocketopt(sock, APR_SO_RCVBUF,
-	    conf->recv_buffer_size))) {
-	    ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
-			 "setsockopt(SO_RCVBUF): Failed to set ProxyReceiveBufferSize, using default");
+        && (rv = apr_setsocketopt(sock, APR_SO_RCVBUF,
+                                  conf->recv_buffer_size))) {
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+                      "setsockopt(SO_RCVBUF): Failed to set ProxyReceiveBufferSize, using default");
     }
 #endif
 
     if (APR_SUCCESS != (rv = apr_setsocketopt(sock, APR_SO_REUSEADDR, one))) {
-#ifndef _OSD_POSIX /* BS2000 has this option "always on" */
-	ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
-		     "proxy: FTP: error setting reuseaddr option: setsockopt(SO_REUSEADDR)");
-	return HTTP_INTERNAL_SERVER_ERROR;
-#endif /*_OSD_POSIX*/
+#ifndef _OSD_POSIX              /* BS2000 has this option "always on" */
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+                      "proxy: FTP: error setting reuseaddr option: setsockopt(SO_REUSEADDR)");
+        return HTTP_INTERNAL_SERVER_ERROR;
+#endif                          /* _OSD_POSIX */
     }
 
     /* Set a timeout on the socket */
     apr_setsocketopt(sock, APR_SO_TIMEOUT, (int)(r->server->timeout * APR_USEC_PER_SEC));
 
-    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		 "proxy: FTP: socket has been created");
+    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                 "proxy: FTP: socket has been created");
 
 
     /*
-     * At this point we have a list of one or more IP addresses of
-     * the machine to connect to. If configured, reorder this
-     * list so that the "best candidate" is first try. "best
-     * candidate" could mean the least loaded server, the fastest
-     * responding server, whatever.
-     *
-     * For now we do nothing, ie we get DNS round robin.
-     * XXX FIXME
+     * At this point we have a list of one or more IP addresses of the
+     * machine to connect to. If configured, reorder this list so that the
+     * "best candidate" is first try. "best candidate" could mean the least
+     * loaded server, the fastest responding server, whatever.
+     * 
+     * For now we do nothing, ie we get DNS round robin. XXX FIXME
      */
 
 
     /* try each IP address until we connect successfully */
     {
-	int failed = 1;
-	while (connect_addr) {
+        int failed = 1;
+        while (connect_addr) {
 
-	    /* make the connection out of the socket */
-	    rv = apr_connect(sock, connect_addr);
+            /* make the connection out of the socket */
+            rv = apr_connect(sock, connect_addr);
 
-	    /* if an error occurred, loop round and try again */
+            /* if an error occurred, loop round and try again */
             if (rv != APR_SUCCESS) {
-		ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
-			     "proxy: FTP: attempt to connect to %pI (%s) failed", connect_addr, connectname);
-		connect_addr = connect_addr->next;
-		continue;
+                ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
+                             "proxy: FTP: attempt to connect to %pI (%s) failed", connect_addr, connectname);
+                connect_addr = connect_addr->next;
+                continue;
             }
 
-	    /* if we get here, all is well */
-	    failed = 0;
-	    break;
-	}
-
-	/* handle a permanent error from the above loop */
-	if (failed) {
-	    return ap_proxyerror(r, HTTP_BAD_GATEWAY, apr_psprintf(r->pool,
-				 "Could not connect to remote machine: %s port %d",
-				 connectname, connectport));
-	}
+            /* if we get here, all is well */
+            failed = 0;
+            break;
+        }
+
+        /* handle a permanent error from the above loop */
+        if (failed) {
+            return ap_proxyerror(r, HTTP_BAD_GATEWAY, apr_psprintf(r->pool,
+                          "Could not connect to remote machine: %s port %d",
+                                                 connectname, connectport));
+        }
     }
 
     /* the socket is now open, create a new connection */
     origin = ap_new_connection(p, r->server, sock, r->connection->id, r->connection->sbh);
     if (!origin) {
-	/* the peer reset the connection already; ap_new_connection() 
-	 * closed the socket */
-	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		     "proxy: FTP: an error occurred creating a new connection to %pI (%s)", connect_addr, connectname);
-	return HTTP_INTERNAL_SERVER_ERROR;
+        /*
+         * the peer reset the connection already; ap_new_connection() closed
+         * the socket
+         */
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                     "proxy: FTP: an error occurred creating a new connection to %pI (%s)", connect_addr, connectname);
+        return HTTP_INTERNAL_SERVER_ERROR;
     }
 
     /* if a keepalive connection is floating around, close it first! */
     /* we might support ftp keepalives later, but not now... */
     if (backend->connection) {
-	apr_socket_close(origin_sock);
-	backend->connection = NULL;
+        apr_socket_close(origin_sock);
+        backend->connection = NULL;
     }
 
-    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		 "proxy: FTP: control connection complete");
+    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                 "proxy: FTP: control connection complete");
 
 
     /*
-     * III: Send Control Request
-     * -------------------------
-     *
-     * Log into the ftp server, send the username & password, change to the correct
-     * directory...
+     * III: Send Control Request -------------------------
+     * 
+     * Log into the ftp server, send the username & password, change to the
+     * correct directory...
      */
 
     /* set up the connection filters */
     ap_proxy_pre_http_connection(origin);
 
     /* possible results: */
-    /*   120 Service ready in nnn minutes. */
-    /*   220 Service ready for new user. */
-    /*   421 Service not available, closing control connection. */
+    /* 120 Service ready in nnn minutes. */
+    /* 220 Service ready for new user. */
+    /* 421 Service not available, closing control connection. */
     rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
-    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		 "proxy: FTP: %d %s", rc, buffer);
+    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                 "proxy: FTP: %d %s", rc, buffer);
     if (rc == -1) {
-	return ap_proxyerror(r, HTTP_BAD_GATEWAY, "Error reading from remote server");
+        return ap_proxyerror(r, HTTP_BAD_GATEWAY, "Error reading from remote server");
     }
     if (rc == 120) {
-	/* RFC2616 states:
-	 * 14.37 Retry-After
-	 * 
-	 *  The Retry-After response-header field can be used with a 503 (Service
-	 *  Unavailable) response to indicate how long the service is expected to
-	 *  be unavailable to the requesting client. [...] The value of this field
-	 *  can be either an HTTP-date or an integer number of seconds (in decimal)
-	 *  after the time of the response.
-	 *     Retry-After  = "Retry-After" ":" ( HTTP-date | delta-seconds )
-	 */
-	for (i = 0; buffer[i] && !isdigit(buffer[i]); i++);
-	if (buffer[i]) {
-	    ap_table_add(r->headers_out, "Retry-After", apr_psprintf(p, "%lu", 60*atol(buffer+i)));
-	}
-	return ap_proxyerror(r, HTTP_SERVICE_UNAVAILABLE, buffer);
+        /*
+         * RFC2616 states: 14.37 Retry-After
+         * 
+         * The Retry-After response-header field can be used with a 503 (Service
+         * Unavailable) response to indicate how long the service is expected
+         * to be unavailable to the requesting client. [...] The value of
+         * this field can be either an HTTP-date or an integer number of
+         * seconds (in decimal) after the time of the response. Retry-After
+         * = "Retry-After" ":" ( HTTP-date | delta-seconds )
+         */
+        for (i = 0; buffer[i] && !isdigit(buffer[i]); i++);
+        if (buffer[i]) {
+            ap_table_add(r->headers_out, "Retry-After", apr_psprintf(p, "%lu", 60 * atol(buffer + i)));
+        }
+        return ap_proxyerror(r, HTTP_SERVICE_UNAVAILABLE, buffer);
     }
     if (rc != 220) {
-	return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
+        return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
     }
 
-    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
+    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
                  "proxy: FTP: connected.");
 
     buf = apr_pstrcat(p, "USER ", user, CRLF, NULL);
@@ -817,124 +818,126 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
     e = apr_bucket_flush_create();
     APR_BRIGADE_INSERT_TAIL(bb, e);
     ap_pass_brigade(origin->output_filters, bb);
-    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
+    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
                  "proxy: FTP: USER %s", user);
 
     /* possible results; 230, 331, 332, 421, 500, 501, 530 */
     /* states: 1 - error, 2 - success; 3 - send password, 4,5 fail */
-    /*   230 User logged in, proceed. */
-    /*   331 User name okay, need password. */
-    /*   332 Need account for login. */
-    /*   421 Service not available, closing control connection. */
-    /*   500 Syntax error, command unrecognized. */
-    /*       (This may include errors such as command line too long.) */
-    /*   501 Syntax error in parameters or arguments. */
-    /*   530 Not logged in. */
+    /* 230 User logged in, proceed. */
+    /* 331 User name okay, need password. */
+    /* 332 Need account for login. */
+    /* 421 Service not available, closing control connection. */
+    /* 500 Syntax error, command unrecognized. */
+    /* (This may include errors such as command line too long.) */
+    /* 501 Syntax error in parameters or arguments. */
+    /* 530 Not logged in. */
     rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
-    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		 "proxy: FTP: %d %s", rc, buffer);
+    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                 "proxy: FTP: %d %s", rc, buffer);
     if (rc == -1) {
-	return ap_proxyerror(r, HTTP_BAD_GATEWAY, "Error reading from remote server");
+        return ap_proxyerror(r, HTTP_BAD_GATEWAY, "Error reading from remote server");
     }
     if (rc == 530) {
-	return ftp_unauthorized (r, 1);	/* log it: user name guessing attempt? */
+        return ftp_unauthorized(r, 1);  /* log it: user name guessing
+                                         * attempt? */
     }
     if (rc != 230 && rc != 331) {
-	return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
+        return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
     }
 
-    if (rc == 331) {		/* send password */
-	if (password == NULL) {
-	    return ftp_unauthorized (r, 0);
-	}
-	buf = apr_pstrcat(p, "PASS ", password, CRLF, NULL);
-	e = apr_bucket_pool_create(buf, strlen(buf), p);
-	APR_BRIGADE_INSERT_TAIL(bb, e);
-	e = apr_bucket_flush_create();
-	APR_BRIGADE_INSERT_TAIL(bb, e);
-	ap_pass_brigade(origin->output_filters, bb);
-	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
+    if (rc == 331) {            /* send password */
+        if (password == NULL) {
+            return ftp_unauthorized(r, 0);
+        }
+        buf = apr_pstrcat(p, "PASS ", password, CRLF, NULL);
+        e = apr_bucket_pool_create(buf, strlen(buf), p);
+        APR_BRIGADE_INSERT_TAIL(bb, e);
+        e = apr_bucket_flush_create();
+        APR_BRIGADE_INSERT_TAIL(bb, e);
+        ap_pass_brigade(origin->output_filters, bb);
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
                      "proxy: FTP: PASS %s", password);
 
-	/* possible results 202, 230, 332, 421, 500, 501, 503, 530 */
-	/*   230 User logged in, proceed. */
-	/*   332 Need account for login. */
-	/*   421 Service not available, closing control connection. */
-	/*   500 Syntax error, command unrecognized. */
-	/*   501 Syntax error in parameters or arguments. */
-	/*   503 Bad sequence of commands. */
-	/*   530 Not logged in. */
-	rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
-        ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		 "proxy: FTP: %d %s", rc, buffer);
-	if (rc == -1) {
-	    return ap_proxyerror(r, HTTP_BAD_GATEWAY,
-				 "Error reading from remote server");
-	}
-	if (rc == 332) {
-	    return ap_proxyerror(r, HTTP_UNAUTHORIZED,
-				 apr_pstrcat(p, "Need account for login: ", buffer, NULL));
-	}
-	/* @@@ questionable -- we might as well return a 403 Forbidden here */
-	if (rc == 530) {
-	    return ftp_unauthorized (r, 1); /* log it: passwd guessing attempt? */
-	}
-	if (rc != 230 && rc != 202) {
-	    return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
-	}
+        /* possible results 202, 230, 332, 421, 500, 501, 503, 530 */
+        /* 230 User logged in, proceed. */
+        /* 332 Need account for login. */
+        /* 421 Service not available, closing control connection. */
+        /* 500 Syntax error, command unrecognized. */
+        /* 501 Syntax error in parameters or arguments. */
+        /* 503 Bad sequence of commands. */
+        /* 530 Not logged in. */
+        rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                     "proxy: FTP: %d %s", rc, buffer);
+        if (rc == -1) {
+            return ap_proxyerror(r, HTTP_BAD_GATEWAY,
+                                 "Error reading from remote server");
+        }
+        if (rc == 332) {
+            return ap_proxyerror(r, HTTP_UNAUTHORIZED,
+                  apr_pstrcat(p, "Need account for login: ", buffer, NULL));
+        }
+        /* @@@ questionable -- we might as well return a 403 Forbidden here */
+        if (rc == 530) {
+            return ftp_unauthorized(r, 1);      /* log it: passwd guessing
+                                                 * attempt? */
+        }
+        if (rc != 230 && rc != 202) {
+            return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
+        }
     }
     apr_table_set(r->notes, "Directory-README", buffer);
 
-    /* set the directory (walk directory component by component):
-     * this is what we must do if we don't know the OS type of the remote
-     * machine
+    /*
+     * set the directory (walk directory component by component): this is
+     * what we must do if we don't know the OS type of the remote machine
      */
     for (;;) {
-	strp = strchr(path, '/');
-	if (strp == NULL)
-	    break;
-	*strp = '\0';
-
-	len = decodeenc(path);
-	buf = apr_pstrcat(p, "CWD ", path, CRLF, NULL);
-	e = apr_bucket_pool_create(buf, strlen(buf), p);
-	APR_BRIGADE_INSERT_TAIL(bb, e);
-	e = apr_bucket_flush_create();
-	APR_BRIGADE_INSERT_TAIL(bb, e);
-	ap_pass_brigade(origin->output_filters, bb);
-	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
+        strp = strchr(path, '/');
+        if (strp == NULL)
+            break;
+        *strp = '\0';
+
+        len = decodeenc(path);
+        buf = apr_pstrcat(p, "CWD ", path, CRLF, NULL);
+        e = apr_bucket_pool_create(buf, strlen(buf), p);
+        APR_BRIGADE_INSERT_TAIL(bb, e);
+        e = apr_bucket_flush_create();
+        APR_BRIGADE_INSERT_TAIL(bb, e);
+        ap_pass_brigade(origin->output_filters, bb);
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
                      "proxy: FTP: CWD %s", path);
-	*strp = '/';
-	/* responses: 250, 421, 500, 501, 502, 530, 550 */
-	/*   250 Requested file action okay, completed. */
-	/*   421 Service not available, closing control connection. */
-	/*   500 Syntax error, command unrecognized. */
-	/*   501 Syntax error in parameters or arguments. */
-	/*   502 Command not implemented. */
-	/*   530 Not logged in. */
-	/*   550 Requested action not taken. */
-	rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
-        ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		 "proxy: FTP: %d %s", rc, buffer);
-	if (rc == -1) {
-	    return ap_proxyerror(r, HTTP_BAD_GATEWAY,
-				 "Error reading from remote server");
-	}
-	if (rc == 550) {
-	    return ap_proxyerror(r, HTTP_NOT_FOUND, buffer);
-	}
-	if (rc != 250) {
-	    return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
-	}
-
-	path = strp + 1;
+        *strp = '/';
+        /* responses: 250, 421, 500, 501, 502, 530, 550 */
+        /* 250 Requested file action okay, completed. */
+        /* 421 Service not available, closing control connection. */
+        /* 500 Syntax error, command unrecognized. */
+        /* 501 Syntax error in parameters or arguments. */
+        /* 502 Command not implemented. */
+        /* 530 Not logged in. */
+        /* 550 Requested action not taken. */
+        rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                     "proxy: FTP: %d %s", rc, buffer);
+        if (rc == -1) {
+            return ap_proxyerror(r, HTTP_BAD_GATEWAY,
+                                 "Error reading from remote server");
+        }
+        if (rc == 550) {
+            return ap_proxyerror(r, HTTP_NOT_FOUND, buffer);
+        }
+        if (rc != 250) {
+            return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
+        }
+
+        path = strp + 1;
     }
 
     if (parms != NULL && strncasecmp(parms, "type=a", 6) == 0) {
-	parms = "A";
+        parms = "A";
     }
     else {
-	parms = "I";
+        parms = "I";
     }
 
     /* changed to make binary transfers the default */
@@ -945,323 +948,322 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
     e = apr_bucket_flush_create();
     APR_BRIGADE_INSERT_TAIL(bb, e);
     ap_pass_brigade(origin->output_filters, bb);
-    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		 "proxy: FTP: TYPE I");
+    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                 "proxy: FTP: TYPE I");
     /* responses: 200, 421, 500, 501, 504, 530 */
-    /*   200 Command okay. */
-    /*   421 Service not available, closing control connection. */
-    /*   500 Syntax error, command unrecognized. */
-    /*   501 Syntax error in parameters or arguments. */
-    /*   504 Command not implemented for that parameter. */
-    /*   530 Not logged in. */
+    /* 200 Command okay. */
+    /* 421 Service not available, closing control connection. */
+    /* 500 Syntax error, command unrecognized. */
+    /* 501 Syntax error in parameters or arguments. */
+    /* 504 Command not implemented for that parameter. */
+    /* 530 Not logged in. */
     rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
-    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		 "proxy: FTP: %d %s", rc, buffer);
+    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                 "proxy: FTP: %d %s", rc, buffer);
     if (rc == -1) {
-	return ap_proxyerror(r, HTTP_BAD_GATEWAY,
-			     "Error reading from remote server");
+        return ap_proxyerror(r, HTTP_BAD_GATEWAY,
+                             "Error reading from remote server");
     }
     if (rc != 200 && rc != 504) {
-	return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
+        return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
     }
     /* Allow not implemented */
     if (rc == 504) {
-	parms[0] = '\0';
+        parms[0] = '\0';
     }
 
 
     /*
-     * IV: Make Data Connection?
-     * -------------------------
-     *
-     * Try EPSV, if that fails...
-     * try PASV, if that fails...
-     * try PORT.
+     * IV: Make Data Connection? -------------------------
+     * 
+     * Try EPSV, if that fails... try PASV, if that fails... try PORT.
      */
 /* this temporarily switches off EPSV/PASV */
 /*goto bypass;*/
 
     /* set up data connection - EPSV */
     {
-	apr_sockaddr_t *remote_addr;
-	char *remote_ip;
-	apr_port_t remote_port;
-
-	/* The EPSV command replaces PASV where both IPV4 and IPV6 is supported. Only
-	 * the port is returned, the IP address is always the same as that on the
-	 * control connection. Example:
-	 *   Entering Extended Passive Mode (|||6446|)
-	 */
-	buf = apr_pstrcat(p, "EPSV", CRLF, NULL);
-	e = apr_bucket_pool_create(buf, strlen(buf), p);
-	APR_BRIGADE_INSERT_TAIL(bb, e);
-	e = apr_bucket_flush_create();
-	APR_BRIGADE_INSERT_TAIL(bb, e);
-	ap_pass_brigade(origin->output_filters, bb);
-	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
+        apr_sockaddr_t *remote_addr;
+        char *remote_ip;
+        apr_port_t remote_port;
+
+        /*
+         * The EPSV command replaces PASV where both IPV4 and IPV6 is
+         * supported. Only the port is returned, the IP address is always the
+         * same as that on the control connection. Example: Entering Extended
+         * Passive Mode (|||6446|)
+         */
+        buf = apr_pstrcat(p, "EPSV", CRLF, NULL);
+        e = apr_bucket_pool_create(buf, strlen(buf), p);
+        APR_BRIGADE_INSERT_TAIL(bb, e);
+        e = apr_bucket_flush_create();
+        APR_BRIGADE_INSERT_TAIL(bb, e);
+        ap_pass_brigade(origin->output_filters, bb);
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
                      "proxy: FTP: EPSV");
-	/* possible results: 227, 421, 500, 501, 502, 530 */
-	/*   227 Entering Passive Mode (h1,h2,h3,h4,p1,p2). */
-	/*   421 Service not available, closing control connection. */
-	/*   500 Syntax error, command unrecognized. */
-	/*   501 Syntax error in parameters or arguments. */
-	/*   502 Command not implemented. */
-	/*   530 Not logged in. */
-	rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
-	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		     "proxy: FTP: %d %s", rc, buffer);
-	if (rc == -1) {
-	    return ap_proxyerror(r, HTTP_BAD_GATEWAY,
-				 "Error reading from remote server");
-	}
-	if (rc != 229 && rc != 500 && rc != 501 && rc != 502) {
-	    return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
-	}
-	else if (rc == 229) {
-	    char *pstr;
-	    char *tok_cntx;
-
-	    pstr = apr_pstrdup(p, buffer);
-	    pstr = apr_strtok(pstr, " ", &tok_cntx); /* separate result code */
-	    if (pstr != NULL) {
-		if (*(pstr + strlen(pstr) + 1) == '=') {
-		    pstr += strlen(pstr) + 2;
-		}
-		else {
-		    pstr = apr_strtok(NULL, "(", &tok_cntx);  /* separate address & port params */
-		    if (pstr != NULL)
-			pstr = apr_strtok(NULL, ")", &tok_cntx);
-		}
-	    }
-
-	    if (pstr) {
-		apr_sockaddr_t *epsv_addr;
-		remote_port = atoi(pstr+3);
-
-        	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-                             "proxy: FTP: EPSV contacting remote host on port %d",
+        /* possible results: 227, 421, 500, 501, 502, 530 */
+        /* 227 Entering Passive Mode (h1,h2,h3,h4,p1,p2). */
+        /* 421 Service not available, closing control connection. */
+        /* 500 Syntax error, command unrecognized. */
+        /* 501 Syntax error in parameters or arguments. */
+        /* 502 Command not implemented. */
+        /* 530 Not logged in. */
+        rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                     "proxy: FTP: %d %s", rc, buffer);
+        if (rc == -1) {
+            return ap_proxyerror(r, HTTP_BAD_GATEWAY,
+                                 "Error reading from remote server");
+        }
+        if (rc != 229 && rc != 500 && rc != 501 && rc != 502) {
+            return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
+        }
+        else if (rc == 229) {
+            char *pstr;
+            char *tok_cntx;
+
+            pstr = apr_pstrdup(p, buffer);
+            pstr = apr_strtok(pstr, " ", &tok_cntx);    /* separate result code */
+            if (pstr != NULL) {
+                if (*(pstr + strlen(pstr) + 1) == '=') {
+                    pstr += strlen(pstr) + 2;
+                }
+                else {
+                    pstr = apr_strtok(NULL, "(", &tok_cntx);    /* separate address &
+                                                                 * port params */
+                    if (pstr != NULL)
+                        pstr = apr_strtok(NULL, ")", &tok_cntx);
+                }
+            }
+
+            if (pstr) {
+                apr_sockaddr_t *epsv_addr;
+                remote_port = atoi(pstr + 3);
+
+                ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                       "proxy: FTP: EPSV contacting remote host on port %d",
                              remote_port);
 
-		if ((rv = apr_socket_create(&remote_sock, APR_INET, SOCK_STREAM, r->pool)) != APR_SUCCESS) {
-		    ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
-			          "proxy: FTP: error creating EPSV socket");
-		    return HTTP_INTERNAL_SERVER_ERROR;
-		}
+                if ((rv = apr_socket_create(&remote_sock, APR_INET, SOCK_STREAM, r->pool)) != APR_SUCCESS) {
+                    ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+                                  "proxy: FTP: error creating EPSV socket");
+                    return HTTP_INTERNAL_SERVER_ERROR;
+                }
 
 #if !defined (TPF) && !defined(BEOS)
-		if (conf->recv_buffer_size > 0 && (rv = apr_setsocketopt(remote_sock, APR_SO_RCVBUF,
-		    conf->recv_buffer_size))) {
-		    ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
-				  "proxy: FTP: setsockopt(SO_RCVBUF): Failed to set ProxyReceiveBufferSize, using default");
-		}
+                if (conf->recv_buffer_size > 0 && (rv = apr_setsocketopt(remote_sock, APR_SO_RCVBUF,
+                                                 conf->recv_buffer_size))) {
+                    ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+                                  "proxy: FTP: setsockopt(SO_RCVBUF): Failed to set ProxyReceiveBufferSize, using default");
+                }
 #endif
 
-		/* make the connection */
-		apr_socket_addr_get(&remote_addr, APR_REMOTE, sock);
-		apr_sockaddr_ip_get(&remote_ip, remote_addr);
-		apr_sockaddr_info_get(&epsv_addr, remote_ip, APR_INET, remote_port, 0, p);
-		rv = apr_connect(remote_sock, epsv_addr);
-		if (rv != APR_SUCCESS) {
-		    ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
-				 "proxy: FTP: EPSV attempt to connect to %pI failed - Firewall/NAT?", epsv_addr);
-		    return ap_proxyerror(r, HTTP_BAD_GATEWAY, apr_psprintf(r->pool,
-				         "EPSV attempt to connect to %pI failed - firewall/NAT?", epsv_addr));
-		}
-		else {
-		    connect = 1;
-		}
-	    }
-	    else {
-		/* and try the regular way */
-		apr_socket_close(remote_sock);
-	    }
-	}
+                /* make the connection */
+                apr_socket_addr_get(&remote_addr, APR_REMOTE, sock);
+                apr_sockaddr_ip_get(&remote_ip, remote_addr);
+                apr_sockaddr_info_get(&epsv_addr, remote_ip, APR_INET, remote_port, 0, p);
+                rv = apr_connect(remote_sock, epsv_addr);
+                if (rv != APR_SUCCESS) {
+                    ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
+                                 "proxy: FTP: EPSV attempt to connect to %pI failed - Firewall/NAT?", epsv_addr);
+                    return ap_proxyerror(r, HTTP_BAD_GATEWAY, apr_psprintf(r->pool,
+                                                                           "EPSV attempt to connect to %pI failed - firewall/NAT?", epsv_addr));
+                }
+                else {
+                    connect = 1;
+                }
+            }
+            else {
+                /* and try the regular way */
+                apr_socket_close(remote_sock);
+            }
+        }
     }
 
     /* set up data connection - PASV */
     if (!connect) {
-	buf = apr_pstrcat(p, "PASV", CRLF, NULL);
-	e = apr_bucket_pool_create(buf, strlen(buf), p);
-	APR_BRIGADE_INSERT_TAIL(bb, e);
-	e = apr_bucket_flush_create();
-	APR_BRIGADE_INSERT_TAIL(bb, e);
-	ap_pass_brigade(origin->output_filters, bb);
-	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
+        buf = apr_pstrcat(p, "PASV", CRLF, NULL);
+        e = apr_bucket_pool_create(buf, strlen(buf), p);
+        APR_BRIGADE_INSERT_TAIL(bb, e);
+        e = apr_bucket_flush_create();
+        APR_BRIGADE_INSERT_TAIL(bb, e);
+        ap_pass_brigade(origin->output_filters, bb);
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
                      "proxy: FTP: PASV");
-	/* possible results: 227, 421, 500, 501, 502, 530 */
-	/*   227 Entering Passive Mode (h1,h2,h3,h4,p1,p2). */
-	/*   421 Service not available, closing control connection. */
-	/*   500 Syntax error, command unrecognized. */
-	/*   501 Syntax error in parameters or arguments. */
-	/*   502 Command not implemented. */
-	/*   530 Not logged in. */
-	rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
-	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		     "proxy: FTP: %d %s", rc, buffer);
-	if (rc == -1) {
-	    return ap_proxyerror(r, HTTP_BAD_GATEWAY,
-				 "Error reading from remote server");
-	}
-	if (rc != 227 && rc != 502) {
-	    return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
-	}
-	else if (rc == 227) {
-	    unsigned int h0, h1, h2, h3, p0, p1;
-	    char *pstr;
-	    char *tok_cntx;
+        /* possible results: 227, 421, 500, 501, 502, 530 */
+        /* 227 Entering Passive Mode (h1,h2,h3,h4,p1,p2). */
+        /* 421 Service not available, closing control connection. */
+        /* 500 Syntax error, command unrecognized. */
+        /* 501 Syntax error in parameters or arguments. */
+        /* 502 Command not implemented. */
+        /* 530 Not logged in. */
+        rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                     "proxy: FTP: %d %s", rc, buffer);
+        if (rc == -1) {
+            return ap_proxyerror(r, HTTP_BAD_GATEWAY,
+                                 "Error reading from remote server");
+        }
+        if (rc != 227 && rc != 502) {
+            return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
+        }
+        else if (rc == 227) {
+            unsigned int h0, h1, h2, h3, p0, p1;
+            char *pstr;
+            char *tok_cntx;
 
 /* FIXME: Check PASV against RFC1123 */
 
-	    pstr = apr_pstrdup(p, buffer);
-	    pstr = apr_strtok(pstr, " ", &tok_cntx); /* separate result code */
-	    if (pstr != NULL) {
-		if (*(pstr + strlen(pstr) + 1) == '=') {
-		    pstr += strlen(pstr) + 2;
-		}
-		else {
-		    pstr = apr_strtok(NULL, "(", &tok_cntx);  /* separate address & port params */
-		    if (pstr != NULL)
-			pstr = apr_strtok(NULL, ")", &tok_cntx);
-		}
-	    }
+            pstr = apr_pstrdup(p, buffer);
+            pstr = apr_strtok(pstr, " ", &tok_cntx);    /* separate result code */
+            if (pstr != NULL) {
+                if (*(pstr + strlen(pstr) + 1) == '=') {
+                    pstr += strlen(pstr) + 2;
+                }
+                else {
+                    pstr = apr_strtok(NULL, "(", &tok_cntx);    /* separate address &
+                                                                 * port params */
+                    if (pstr != NULL)
+                        pstr = apr_strtok(NULL, ")", &tok_cntx);
+                }
+            }
 
 /* FIXME: Only supports IPV4 - fix in RFC2428 */
 
-	    if (pstr != NULL && (sscanf(pstr,
-		"%d,%d,%d,%d,%d,%d", &h3, &h2, &h1, &h0, &p1, &p0) == 6)) {
+            if (pstr != NULL && (sscanf(pstr,
+                 "%d,%d,%d,%d,%d,%d", &h3, &h2, &h1, &h0, &p1, &p0) == 6)) {
 
-		apr_sockaddr_t *pasv_addr;
-		apr_port_t pasvport = (p1 << 8) + p0;
-        	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-                             "proxy: FTP: PASV contacting host %d.%d.%d.%d:%d",
+                apr_sockaddr_t *pasv_addr;
+                apr_port_t pasvport = (p1 << 8) + p0;
+                ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                          "proxy: FTP: PASV contacting host %d.%d.%d.%d:%d",
                              h3, h2, h1, h0, pasvport);
 
-		if ((rv = apr_socket_create(&remote_sock, APR_INET, SOCK_STREAM, r->pool)) != APR_SUCCESS) {
-		    ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
-			          "proxy: error creating PASV socket");
-		    return HTTP_INTERNAL_SERVER_ERROR;
-		}
+                if ((rv = apr_socket_create(&remote_sock, APR_INET, SOCK_STREAM, r->pool)) != APR_SUCCESS) {
+                    ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+                                  "proxy: error creating PASV socket");
+                    return HTTP_INTERNAL_SERVER_ERROR;
+                }
 
 #if !defined (TPF) && !defined(BEOS)
-		if (conf->recv_buffer_size > 0 && (rv = apr_setsocketopt(remote_sock, APR_SO_RCVBUF,
-		    conf->recv_buffer_size))) {
-		    ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
-				  "proxy: FTP: setsockopt(SO_RCVBUF): Failed to set ProxyReceiveBufferSize, using default");
-		}
+                if (conf->recv_buffer_size > 0 && (rv = apr_setsocketopt(remote_sock, APR_SO_RCVBUF,
+                                                 conf->recv_buffer_size))) {
+                    ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+                                  "proxy: FTP: setsockopt(SO_RCVBUF): Failed to set ProxyReceiveBufferSize, using default");
+                }
 #endif
 
-		/* make the connection */
-		apr_sockaddr_info_get(&pasv_addr, apr_psprintf(p, "%d.%d.%d.%d", h3, h2, h1, h0), APR_INET, pasvport, 0, p);
-		rv = apr_connect(remote_sock, pasv_addr);
-		if (rv != APR_SUCCESS) {
-		    ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
-				 "proxy: FTP: PASV attempt to connect to %pI failed - Firewall/NAT?", pasv_addr);
-		    return ap_proxyerror(r, HTTP_BAD_GATEWAY, apr_psprintf(r->pool,
-				         "PASV attempt to connect to %pI failed - firewall/NAT?", pasv_addr));
-		}
-		else {
-		    connect = 1;
-		}
-	    }
-	    else {
-		/* and try the regular way */
-		apr_socket_close(remote_sock);
-	    }
-	}
+                /* make the connection */
+                apr_sockaddr_info_get(&pasv_addr, apr_psprintf(p, "%d.%d.%d.%d", h3, h2, h1, h0), APR_INET, pasvport, 0, p);
+                rv = apr_connect(remote_sock, pasv_addr);
+                if (rv != APR_SUCCESS) {
+                    ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
+                                 "proxy: FTP: PASV attempt to connect to %pI failed - Firewall/NAT?", pasv_addr);
+                    return ap_proxyerror(r, HTTP_BAD_GATEWAY, apr_psprintf(r->pool,
+                                                                           "PASV attempt to connect to %pI failed - firewall/NAT?", pasv_addr));
+                }
+                else {
+                    connect = 1;
+                }
+            }
+            else {
+                /* and try the regular way */
+                apr_socket_close(remote_sock);
+            }
+        }
     }
 /*bypass:*/
 
     /* set up data connection - PORT */
     if (!connect) {
-	apr_sockaddr_t *local_addr;
-	char *local_ip;
-	apr_port_t local_port;
-	unsigned int h0, h1, h2, h3, p0, p1;
-
-	if ((rv = apr_socket_create(&local_sock, APR_INET, SOCK_STREAM, r->pool)) != APR_SUCCESS) {
-	    ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
-			 "proxy: FTP: error creating local socket");
-	    return HTTP_INTERNAL_SERVER_ERROR;
-	}
+        apr_sockaddr_t *local_addr;
+        char *local_ip;
+        apr_port_t local_port;
+        unsigned int h0, h1, h2, h3, p0, p1;
+
+        if ((rv = apr_socket_create(&local_sock, APR_INET, SOCK_STREAM, r->pool)) != APR_SUCCESS) {
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+                          "proxy: FTP: error creating local socket");
+            return HTTP_INTERNAL_SERVER_ERROR;
+        }
         apr_socket_addr_get(&local_addr, APR_LOCAL, sock);
         apr_sockaddr_port_get(&local_port, local_addr);
         apr_sockaddr_ip_get(&local_ip, local_addr);
 
-	if ((rv = apr_setsocketopt(local_sock, APR_SO_REUSEADDR, one)) != APR_SUCCESS) {
-#ifndef _OSD_POSIX /* BS2000 has this option "always on" */
-	    ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
-			 "proxy: FTP: error setting reuseaddr option");
-	    return HTTP_INTERNAL_SERVER_ERROR;
-#endif /*_OSD_POSIX*/
-	}
+        if ((rv = apr_setsocketopt(local_sock, APR_SO_REUSEADDR, one)) != APR_SUCCESS) {
+#ifndef _OSD_POSIX              /* BS2000 has this option "always on" */
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+                          "proxy: FTP: error setting reuseaddr option");
+            return HTTP_INTERNAL_SERVER_ERROR;
+#endif                          /* _OSD_POSIX */
+        }
 
         apr_sockaddr_info_get(&local_addr, local_ip, APR_UNSPEC, local_port, 0, r->pool);
 
-	if ((rv = apr_bind(local_sock, local_addr)) != APR_SUCCESS) {
-	    ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
-			 "proxy: FTP: error binding to ftp data socket %pI", local_addr);
-	    return HTTP_INTERNAL_SERVER_ERROR;
-	}
+        if ((rv = apr_bind(local_sock, local_addr)) != APR_SUCCESS) {
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+            "proxy: FTP: error binding to ftp data socket %pI", local_addr);
+            return HTTP_INTERNAL_SERVER_ERROR;
+        }
 
-	/* only need a short queue */
-	if ((rv = apr_listen(local_sock, 2)) != APR_SUCCESS) {
-	    ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
-			 "proxy: FTP: error listening to ftp data socket %pI", local_addr);
-	    return HTTP_INTERNAL_SERVER_ERROR;
-	}
+        /* only need a short queue */
+        if ((rv = apr_listen(local_sock, 2)) != APR_SUCCESS) {
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+                          "proxy: FTP: error listening to ftp data socket %pI", local_addr);
+            return HTTP_INTERNAL_SERVER_ERROR;
+        }
 
 /* FIXME: Sent PORT here */
 
-	if (local_ip && (sscanf(local_ip,
-		 "%d.%d.%d.%d", &h3, &h2, &h1, &h0) == 4)) {
-	    p1 = (local_port >> 8);
-	    p0 = (local_port & 0xFF);
-
-	    buf = apr_psprintf(p, "PORT %d,%d,%d,%d,%d,%d" CRLF, h3, h2, h1, h0, p1, p0);
-	    e = apr_bucket_pool_create(buf, strlen(buf), p);
-	    APR_BRIGADE_INSERT_TAIL(bb, e);
-	    e = apr_bucket_flush_create();
-	    APR_BRIGADE_INSERT_TAIL(bb, e);
-	    ap_pass_brigade(origin->output_filters, bb);
-            ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-                         "proxy: FTP: PORT %d,%d,%d,%d,%d,%d", h3, h2, h1, h0, p1, p0);
-	    /* possible results: 200, 421, 500, 501, 502, 530 */
-	    /*   200 Command okay. */
-	    /*   421 Service not available, closing control connection. */
-	    /*   500 Syntax error, command unrecognized. */
-	    /*   501 Syntax error in parameters or arguments. */
-	    /*   502 Command not implemented. */
-	    /*   530 Not logged in. */
-	    rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
-	    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		 "proxy: FTP: %d %s", rc, buffer);
-	    if (rc == -1) {
-		return ap_proxyerror(r, HTTP_BAD_GATEWAY,
-				     "Error reading from remote server");
-	    }
-	    if (rc != 200) {
-		return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
-	    }
-
-	    /* signal that we must use the EPRT/PORT loop */
-	    use_port = 1;
-	}
-	else {
+        if (local_ip && (sscanf(local_ip,
+                                "%d.%d.%d.%d", &h3, &h2, &h1, &h0) == 4)) {
+            p1 = (local_port >> 8);
+            p0 = (local_port & 0xFF);
+
+            buf = apr_psprintf(p, "PORT %d,%d,%d,%d,%d,%d" CRLF, h3, h2, h1, h0, p1, p0);
+            e = apr_bucket_pool_create(buf, strlen(buf), p);
+            APR_BRIGADE_INSERT_TAIL(bb, e);
+            e = apr_bucket_flush_create();
+            APR_BRIGADE_INSERT_TAIL(bb, e);
+            ap_pass_brigade(origin->output_filters, bb);
+            ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+              "proxy: FTP: PORT %d,%d,%d,%d,%d,%d", h3, h2, h1, h0, p1, p0);
+            /* possible results: 200, 421, 500, 501, 502, 530 */
+            /* 200 Command okay. */
+            /* 421 Service not available, closing control connection. */
+            /* 500 Syntax error, command unrecognized. */
+            /* 501 Syntax error in parameters or arguments. */
+            /* 502 Command not implemented. */
+            /* 530 Not logged in. */
+            rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
+            ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                         "proxy: FTP: %d %s", rc, buffer);
+            if (rc == -1) {
+                return ap_proxyerror(r, HTTP_BAD_GATEWAY,
+                                     "Error reading from remote server");
+            }
+            if (rc != 200) {
+                return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
+            }
+
+            /* signal that we must use the EPRT/PORT loop */
+            use_port = 1;
+        }
+        else {
 /* IPV6 FIXME:
  * The EPRT command replaces PORT where both IPV4 and IPV6 is supported. The first
  * number (1,2) indicates the protocol type. Examples:
  *   EPRT |1|132.235.1.2|6275|
  *   EPRT |2|1080::8:800:200C:417A|5282|
  */
-	    return ap_proxyerror(r, HTTP_NOT_IMPLEMENTED, "Connect to IPV6 ftp server using EPRT not supported. Enable EPSV.");
-	}
+            return ap_proxyerror(r, HTTP_NOT_IMPLEMENTED, "Connect to IPV6 ftp server using EPRT not supported. Enable EPSV.");
+        }
     }
 
 
     /*
-     * V: Set The Headers
-     * -------------------
-     *
+     * V: Set The Headers -------------------
+     * 
      * Get the size of the request, set up the environment for HTTP.
      */
 
@@ -1271,64 +1273,64 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
     /* TM - if len == 0 then it must be a directory (you can't RETR nothing) */
 
     if (len == 0) {
-	parms = "d";
+        parms = "d";
     }
     else {
-	buf = apr_pstrcat(p, "SIZE ", path, CRLF, NULL);
-	e = apr_bucket_pool_create(buf, strlen(buf), p);
-	APR_BRIGADE_INSERT_TAIL(bb, e);
-	e = apr_bucket_flush_create();
-	APR_BRIGADE_INSERT_TAIL(bb, e);
-	ap_pass_brigade(origin->output_filters, bb);
-        ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
+        buf = apr_pstrcat(p, "SIZE ", path, CRLF, NULL);
+        e = apr_bucket_pool_create(buf, strlen(buf), p);
+        APR_BRIGADE_INSERT_TAIL(bb, e);
+        e = apr_bucket_flush_create();
+        APR_BRIGADE_INSERT_TAIL(bb, e);
+        ap_pass_brigade(origin->output_filters, bb);
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
                      "proxy: FTP: SIZE %s", path);
-	rc = ftp_getrc_msg(origin, cbb, buffer, sizeof buffer);
-        ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-                     "proxy: FTP: returned status %d with response %s", rc, buffer);
-	if (rc != 500) {		/* Size command not recognized */
-	    if (rc == 550) {	/* Not a regular file */
-                ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
+        rc = ftp_getrc_msg(origin, cbb, buffer, sizeof buffer);
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+             "proxy: FTP: returned status %d with response %s", rc, buffer);
+        if (rc != 500) {        /* Size command not recognized */
+            if (rc == 550) {    /* Not a regular file */
+                ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
                              "proxy: FTP: SIZE shows this is a directory");
-		parms = "d";
-		buf = apr_pstrcat(p, "CWD ", path, CRLF, NULL);
-		e = apr_bucket_pool_create(buf, strlen(buf), p);
-		APR_BRIGADE_INSERT_TAIL(bb, e);
-		e = apr_bucket_flush_create();
-		APR_BRIGADE_INSERT_TAIL(bb, e);
-		ap_pass_brigade(origin->output_filters, bb);
-                ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
+                parms = "d";
+                buf = apr_pstrcat(p, "CWD ", path, CRLF, NULL);
+                e = apr_bucket_pool_create(buf, strlen(buf), p);
+                APR_BRIGADE_INSERT_TAIL(bb, e);
+                e = apr_bucket_flush_create();
+                APR_BRIGADE_INSERT_TAIL(bb, e);
+                ap_pass_brigade(origin->output_filters, bb);
+                ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
                              "proxy: FTP: CWD %s", path);
-		rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
-		/* possible results: 250, 421, 500, 501, 502, 530, 550 */
-		/* 250 Requested file action okay, completed. */
-		/* 421 Service not available, closing control connection. */
-		/* 500 Syntax error, command unrecognized. */
-		/* 501 Syntax error in parameters or arguments. */
-		/* 502 Command not implemented. */
-		/* 530 Not logged in. */
-		/* 550 Requested action not taken. */
-                ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-			     "proxy: FTP: %d %s", rc, buffer);
-		if (rc == -1) {
-		    return ap_proxyerror(r, HTTP_BAD_GATEWAY,
-					 "Error reading from remote server");
-		}
-		if (rc == 550) {
-		    return ap_proxyerror(r, HTTP_NOT_FOUND, buffer);
-		}
-		if (rc != 250) {
-		    return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
-		}
-		path = "";
-		len = 0;
-	    }
-	    else if (i == 213) { /* Size command ok */
-		for (j = 0; j < sizeof(buffer) && apr_isdigit(buffer[j]); j++);
-		buffer[j] = '\0';
-		if (buffer[0] != '\0')
-		    size = apr_pstrdup(p, buffer);
-	    }
-	}
+                rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
+                /* possible results: 250, 421, 500, 501, 502, 530, 550 */
+                /* 250 Requested file action okay, completed. */
+                /* 421 Service not available, closing control connection. */
+                /* 500 Syntax error, command unrecognized. */
+                /* 501 Syntax error in parameters or arguments. */
+                /* 502 Command not implemented. */
+                /* 530 Not logged in. */
+                /* 550 Requested action not taken. */
+                ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                             "proxy: FTP: %d %s", rc, buffer);
+                if (rc == -1) {
+                    return ap_proxyerror(r, HTTP_BAD_GATEWAY,
+                                         "Error reading from remote server");
+                }
+                if (rc == 550) {
+                    return ap_proxyerror(r, HTTP_NOT_FOUND, buffer);
+                }
+                if (rc != 250) {
+                    return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
+                }
+                path = "";
+                len = 0;
+            }
+            else if (i == 213) {/* Size command ok */
+                for (j = 0; j < sizeof(buffer) && apr_isdigit(buffer[j]); j++);
+                buffer[j] = '\0';
+                if (buffer[0] != '\0')
+                    size = apr_pstrdup(p, buffer);
+            }
+        }
     }
 
 
@@ -1340,156 +1342,159 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
     e = apr_bucket_flush_create();
     APR_BRIGADE_INSERT_TAIL(bb, e);
     ap_pass_brigade(origin->output_filters, bb);
-    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
+    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
                  "proxy: FTP: PWD");
     /* responses: 257, 500, 501, 502, 421, 550 */
-    /*   257 "<directory-name>" <commentary> */
-    /*   421 Service not available, closing control connection. */
-    /*   500 Syntax error, command unrecognized. */
-    /*   501 Syntax error in parameters or arguments. */
-    /*   502 Command not implemented. */
-    /*   550 Requested action not taken. */
+    /* 257 "<directory-name>" <commentary> */
+    /* 421 Service not available, closing control connection. */
+    /* 500 Syntax error, command unrecognized. */
+    /* 501 Syntax error in parameters or arguments. */
+    /* 502 Command not implemented. */
+    /* 550 Requested action not taken. */
     rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
-	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-				 "proxy: FTP: %d %s", rc, buffer);
+    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                 "proxy: FTP: %d %s", rc, buffer);
     if (rc == -1 || rc == 421) {
-	return ap_proxyerror(r, HTTP_BAD_GATEWAY,
-			     "Error reading from remote server");
+        return ap_proxyerror(r, HTTP_BAD_GATEWAY,
+                             "Error reading from remote server");
     }
     if (rc == 550) {
-	return ap_proxyerror(r, HTTP_NOT_FOUND, buffer);
+        return ap_proxyerror(r, HTTP_NOT_FOUND, buffer);
     }
     if (rc == 257) {
-	const char *dirp = buffer;
-	apr_table_set(r->notes, "Directory-PWD", ap_getword_conf(r->pool, &dirp));
+        const char *dirp = buffer;
+        apr_table_set(r->notes, "Directory-PWD", ap_getword_conf(r->pool, &dirp));
     }
-#endif /*AUTODETECT_PWD*/
+#endif                          /* AUTODETECT_PWD */
 
     if (parms[0] == 'd') {
-	if (len != 0)
-	    buf = apr_pstrcat(p, "LIST ", path, CRLF, NULL);
-	else
-	    buf = apr_pstrcat(p, "LIST -lag", CRLF, NULL);
-	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		     "proxy: FTP: LIST %s", (len == 0 ? "-lag" : path));
+        if (len != 0)
+            buf = apr_pstrcat(p, "LIST ", path, CRLF, NULL);
+        else
+            buf = apr_pstrcat(p, "LIST -lag", CRLF, NULL);
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                     "proxy: FTP: LIST %s", (len == 0 ? "-lag" : path));
     }
     else {
 /* FIXME: Handle range requests - send REST */
-	buf = apr_pstrcat(p, "RETR ", path, CRLF, NULL);
-	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		     "proxy: FTP: RETR %s", path);
+        buf = apr_pstrcat(p, "RETR ", path, CRLF, NULL);
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                     "proxy: FTP: RETR %s", path);
     }
     e = apr_bucket_pool_create(buf, strlen(buf), p);
     APR_BRIGADE_INSERT_TAIL(bb, e);
     e = apr_bucket_flush_create();
     APR_BRIGADE_INSERT_TAIL(bb, e);
     ap_pass_brigade(origin->output_filters, bb);
-    /* RETR: 110, 125, 150, 226, 250, 421, 425, 426, 450, 451, 500, 501, 530, 550
-     * NLST: 125, 150, 226, 250, 421, 425, 426, 450, 451, 500, 501, 502, 530 */
-    /*   110 Restart marker reply. */
-    /*   125 Data connection already open; transfer starting. */
-    /*   150 File status okay; about to open data connection. */
-    /*   226 Closing data connection. */
-    /*   250 Requested file action okay, completed. */
-    /*   421 Service not available, closing control connection. */
-    /*   425 Can't open data connection. */
-    /*   426 Connection closed; transfer aborted. */
-    /*   450 Requested file action not taken. */
-    /*   451 Requested action aborted. Local error in processing. */
-    /*   500 Syntax error, command unrecognized. */
-    /*   501 Syntax error in parameters or arguments. */
-    /*   530 Not logged in. */
-    /*   550 Requested action not taken. */
+    /*
+     * RETR: 110, 125, 150, 226, 250, 421, 425, 426, 450, 451, 500, 501, 530,
+     * 550 NLST: 125, 150, 226, 250, 421, 425, 426, 450, 451, 500, 501, 502,
+     * 530
+     */
+    /* 110 Restart marker reply. */
+    /* 125 Data connection already open; transfer starting. */
+    /* 150 File status okay; about to open data connection. */
+    /* 226 Closing data connection. */
+    /* 250 Requested file action okay, completed. */
+    /* 421 Service not available, closing control connection. */
+    /* 425 Can't open data connection. */
+    /* 426 Connection closed; transfer aborted. */
+    /* 450 Requested file action not taken. */
+    /* 451 Requested action aborted. Local error in processing. */
+    /* 500 Syntax error, command unrecognized. */
+    /* 501 Syntax error in parameters or arguments. */
+    /* 530 Not logged in. */
+    /* 550 Requested action not taken. */
     rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
-    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		 "proxy: FTP: %d %s", rc, buffer);
+    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                 "proxy: FTP: %d %s", rc, buffer);
     if (rc == -1) {
-	return ap_proxyerror(r, HTTP_BAD_GATEWAY,
-			     "Error reading from remote server");
+        return ap_proxyerror(r, HTTP_BAD_GATEWAY,
+                             "Error reading from remote server");
     }
     if (rc == 550) {
-        ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
                      "proxy: FTP: RETR failed, trying LIST instead");
-	parms = "d";
-	buf = apr_pstrcat(p, "CWD ", path, CRLF, NULL);
-	e = apr_bucket_pool_create(buf, strlen(buf), p);
-	APR_BRIGADE_INSERT_TAIL(bb, e);
-	e = apr_bucket_flush_create();
-	APR_BRIGADE_INSERT_TAIL(bb, e);
-	ap_pass_brigade(origin->output_filters, bb);
-        ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-                 "proxy: FTP: CWD %s", path);
-	/* possible results: 250, 421, 500, 501, 502, 530, 550 */
-	/*   250 Requested file action okay, completed. */
-	/*   421 Service not available, closing control connection. */
-	/*   500 Syntax error, command unrecognized. */
-	/*   501 Syntax error in parameters or arguments. */
-	/*   502 Command not implemented. */
-	/*   530 Not logged in. */
-	/*   550 Requested action not taken. */
-	rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
-	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-				 "proxy: FTP: %d %s", rc, buffer);
-	if (rc == -1) {
-	    return ap_proxyerror(r, HTTP_BAD_GATEWAY,
-			     "Error reading from remote server");
-	}
-	if (rc == 550) {
-	    return ap_proxyerror(r, HTTP_NOT_FOUND, buffer);
-	}
-	if (rc != 250) {
-	    return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
-	}
+        parms = "d";
+        buf = apr_pstrcat(p, "CWD ", path, CRLF, NULL);
+        e = apr_bucket_pool_create(buf, strlen(buf), p);
+        APR_BRIGADE_INSERT_TAIL(bb, e);
+        e = apr_bucket_flush_create();
+        APR_BRIGADE_INSERT_TAIL(bb, e);
+        ap_pass_brigade(origin->output_filters, bb);
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                     "proxy: FTP: CWD %s", path);
+        /* possible results: 250, 421, 500, 501, 502, 530, 550 */
+        /* 250 Requested file action okay, completed. */
+        /* 421 Service not available, closing control connection. */
+        /* 500 Syntax error, command unrecognized. */
+        /* 501 Syntax error in parameters or arguments. */
+        /* 502 Command not implemented. */
+        /* 530 Not logged in. */
+        /* 550 Requested action not taken. */
+        rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                     "proxy: FTP: %d %s", rc, buffer);
+        if (rc == -1) {
+            return ap_proxyerror(r, HTTP_BAD_GATEWAY,
+                                 "Error reading from remote server");
+        }
+        if (rc == 550) {
+            return ap_proxyerror(r, HTTP_NOT_FOUND, buffer);
+        }
+        if (rc != 250) {
+            return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
+        }
 
 #ifdef AUTODETECT_PWD
-	buf = apr_pstrcat(p, "PWD ", CRLF, NULL);
-	e = apr_bucket_pool_create(buf, strlen(buf), p);
-	APR_BRIGADE_INSERT_TAIL(bb, e);
-	e = apr_bucket_flush_create();
-	APR_BRIGADE_INSERT_TAIL(bb, e);
-	ap_pass_brigade(origin->output_filters, bb);
-	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-				 "proxy: FTP: PWD");
-	/* responses: 257, 500, 501, 502, 421, 550 */
-	/*   257 "<directory-name>" <commentary> */
-	/*   421 Service not available, closing control connection. */
-	/*   500 Syntax error, command unrecognized. */
-	/*   501 Syntax error in parameters or arguments. */
-	/*   502 Command not implemented. */
-	/*   550 Requested action not taken. */
-	rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
-	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-				 "proxy: FTP: %d %s", rc, buffer);
-	if (rc == -1 || rc == 421) {
-	    return ap_proxyerror(r, HTTP_BAD_GATEWAY,
-			     "Error reading from remote server");
-	}
-	if (rc == 550) {
-	    return ap_proxyerror(r, HTTP_NOT_FOUND, buffer);
-	}
-	if (rc == 257) {
-	    const char *dirp = buffer;
-	    apr_table_set(r->notes, "Directory-PWD", ap_getword_conf(r->pool, &dirp));
-	}
-#endif /*AUTODETECT_PWD*/
-
-	buf = apr_pstrcat(p, "LIST -lag", CRLF, NULL);
-	e = apr_bucket_pool_create(buf, strlen(buf), p);
-	APR_BRIGADE_INSERT_TAIL(bb, e);
-	e = apr_bucket_flush_create();
-	APR_BRIGADE_INSERT_TAIL(bb, e);
-	ap_pass_brigade(origin->output_filters, bb);
-	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-				 "proxy: FTP: LIST -lag");
-	rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
-	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-				 "proxy: FTP: %d %s", rc, buffer);
-	if (rc == -1)
-	    return ap_proxyerror(r, HTTP_BAD_GATEWAY,
-			     "Error reading from remote server");
+        buf = apr_pstrcat(p, "PWD ", CRLF, NULL);
+        e = apr_bucket_pool_create(buf, strlen(buf), p);
+        APR_BRIGADE_INSERT_TAIL(bb, e);
+        e = apr_bucket_flush_create();
+        APR_BRIGADE_INSERT_TAIL(bb, e);
+        ap_pass_brigade(origin->output_filters, bb);
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                     "proxy: FTP: PWD");
+        /* responses: 257, 500, 501, 502, 421, 550 */
+        /* 257 "<directory-name>" <commentary> */
+        /* 421 Service not available, closing control connection. */
+        /* 500 Syntax error, command unrecognized. */
+        /* 501 Syntax error in parameters or arguments. */
+        /* 502 Command not implemented. */
+        /* 550 Requested action not taken. */
+        rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                     "proxy: FTP: %d %s", rc, buffer);
+        if (rc == -1 || rc == 421) {
+            return ap_proxyerror(r, HTTP_BAD_GATEWAY,
+                                 "Error reading from remote server");
+        }
+        if (rc == 550) {
+            return ap_proxyerror(r, HTTP_NOT_FOUND, buffer);
+        }
+        if (rc == 257) {
+            const char *dirp = buffer;
+            apr_table_set(r->notes, "Directory-PWD", ap_getword_conf(r->pool, &dirp));
+        }
+#endif                          /* AUTODETECT_PWD */
+
+        buf = apr_pstrcat(p, "LIST -lag", CRLF, NULL);
+        e = apr_bucket_pool_create(buf, strlen(buf), p);
+        APR_BRIGADE_INSERT_TAIL(bb, e);
+        e = apr_bucket_flush_create();
+        APR_BRIGADE_INSERT_TAIL(bb, e);
+        ap_pass_brigade(origin->output_filters, bb);
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                     "proxy: FTP: LIST -lag");
+        rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                     "proxy: FTP: %d %s", rc, buffer);
+        if (rc == -1)
+            return ap_proxyerror(r, HTTP_BAD_GATEWAY,
+                                 "Error reading from remote server");
     }
     if (rc != 125 && rc != 150 && rc != 226 && rc != 250) {
-	return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
+        return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);
     }
 
     r->status = HTTP_OK;
@@ -1501,38 +1506,37 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
 
     /* set content-type */
     if (parms[0] == 'd') {
-	r->content_type = "text/html";
+        r->content_type = "text/html";
     }
     else {
-	if (r->content_type) {
-	    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-			 "proxy: FTP: Content-Type set to %s", r->content_type);
-	}
-	else {
-	    r->content_type = ap_default_type(r);
-	}
-	if (parms[0] != 'a' && size != NULL) {
-	    /* We "trust" the ftp server to really serve (size) bytes... */
-	    apr_table_setn(r->headers_out, "Content-Length", size);
-	    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		         "proxy: FTP: Content-Length set to %s", size);
-	}
+        if (r->content_type) {
+            ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                     "proxy: FTP: Content-Type set to %s", r->content_type);
+        }
+        else {
+            r->content_type = ap_default_type(r);
+        }
+        if (parms[0] != 'a' && size != NULL) {
+            /* We "trust" the ftp server to really serve (size) bytes... */
+            apr_table_setn(r->headers_out, "Content-Length", size);
+            ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                         "proxy: FTP: Content-Length set to %s", size);
+        }
     }
     apr_table_setn(r->headers_out, "Content-Type", r->content_type);
-    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		 "proxy: FTP: Content-Type set to %s", r->content_type);
+    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                 "proxy: FTP: Content-Type set to %s", r->content_type);
 
     /* set content-encoding */
     if (r->content_encoding != NULL && r->content_encoding[0] != '\0') {
-		ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-			     "proxy: FTP: Content-Encoding set to %s", r->content_encoding);
-	apr_table_setn(r->headers_out, "Content-Encoding", r->content_encoding);
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+             "proxy: FTP: Content-Encoding set to %s", r->content_encoding);
+        apr_table_setn(r->headers_out, "Content-Encoding", r->content_encoding);
     }
 
     /* wait for connection */
     if (use_port) {
-        for(;;)
-        {
+        for (;;) {
             rv = apr_accept(&remote_sock, local_sock, r->pool);
             if (rv == APR_EINTR) {
                 continue;
@@ -1542,7 +1546,7 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
             }
             else {
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
-                              "proxy: FTP: failed to accept data connection");
+                            "proxy: FTP: failed to accept data connection");
                 return HTTP_BAD_GATEWAY;
             }
         }
@@ -1551,11 +1555,13 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
     /* the transfer socket is now open, create a new connection */
     remote = ap_new_connection(p, r->server, remote_sock, r->connection->id, r->connection->sbh);
     if (!remote) {
-	/* the peer reset the connection already; ap_new_connection() 
-	 * closed the socket */
-	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		     "proxy: FTP: an error occurred creating the transfer connection");
-	return HTTP_INTERNAL_SERVER_ERROR;
+        /*
+         * the peer reset the connection already; ap_new_connection() closed
+         * the socket
+         */
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+          "proxy: FTP: an error occurred creating the transfer connection");
+        return HTTP_INTERNAL_SERVER_ERROR;
     }
 
     /* set up the connection filters */
@@ -1563,58 +1569,55 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
 
 
     /*
-     * VI: Receive the Response
-     * ------------------------
-     *
-     * Get response from the remote ftp socket, and pass it up the
-     * filter chain.
+     * VI: Receive the Response ------------------------
+     * 
+     * Get response from the remote ftp socket, and pass it up the filter chain.
      */
 
     /* send response */
     r->sent_bodyct = 1;
 
     if (parms[0] == 'd') {
-	/* insert directory filter */
-	ap_add_output_filter("PROXY_SEND_DIR", NULL, r, r->connection);
+        /* insert directory filter */
+        ap_add_output_filter("PROXY_SEND_DIR", NULL, r, r->connection);
     }
 
     /* send body */
     if (!r->header_only) {
 
-	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		     "proxy: FTP: start body send");
-
-	/* read the body, pass it to the output filters */
-	while (ap_get_brigade(remote->input_filters, bb, AP_MODE_EXHAUSTIVE,
-                          APR_BLOCK_READ, 0) == APR_SUCCESS) {
-	    if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) {
-		ap_pass_brigade(r->output_filters, bb);
-		break;
-	    }
-	    if (ap_pass_brigade(r->output_filters, bb) != APR_SUCCESS) {
-		/* Ack! Phbtt! Die! User aborted! */
-		break;
-	    }
-	    apr_brigade_cleanup(bb);
-	}
+        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                     "proxy: FTP: start body send");
+
+        /* read the body, pass it to the output filters */
+        while (ap_get_brigade(remote->input_filters, bb, AP_MODE_EXHAUSTIVE,
+                              APR_BLOCK_READ, 0) == APR_SUCCESS) {
+            if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) {
+                ap_pass_brigade(r->output_filters, bb);
+                break;
+            }
+            if (ap_pass_brigade(r->output_filters, bb) != APR_SUCCESS) {
+                /* Ack! Phbtt! Die! User aborted! */
+                break;
+            }
+            apr_brigade_cleanup(bb);
+        }
     }
     ap_flush_conn(remote);
     apr_socket_close(remote_sock);
-    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		 "proxy: FTP: Closing Data connection.");
+    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                 "proxy: FTP: Closing Data connection.");
     rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
-    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		 "proxy: FTP: %d %s", rc, buffer);
+    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                 "proxy: FTP: %d %s", rc, buffer);
     apr_brigade_cleanup(bb);
-    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-		 "proxy: FTP: end body send");
+    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
+                 "proxy: FTP: end body send");
 
     /*
-     * VII: Clean Up
-     * -------------
-     *
-     * If there are no KeepAlives, or if the connection has been signalled
-     * to close, close the socket and clean up
+     * VII: Clean Up -------------
+     * 
+     * If there are no KeepAlives, or if the connection has been signalled to
+     * close, close the socket and clean up
      */
 
     /* finish */
@@ -1624,14 +1627,14 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
     e = apr_bucket_flush_create();
     APR_BRIGADE_INSERT_TAIL(bb, e);
     ap_pass_brigade(origin->output_filters, bb);
-    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
+    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
                  "proxy: FTP: QUIT");
 
     /* responses: 221, 500 */
     /* 221 Service closing control connection. */
     /* 500 Syntax error, command unrecognized. */
     rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
-    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
+    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
                  "proxy: FTP: %d %s", rc, buffer);
     ap_flush_conn(origin);
     apr_socket_close(origin_sock);
@@ -1639,7 +1642,7 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
     return OK;
 }
 
-static void ap_proxy_ftp_register_hook(apr_pool_t *p)
+static void ap_proxy_ftp_register_hook(apr_pool_t * p)
 {
     /* hooks */
     proxy_hook_scheme_handler(ap_proxy_ftp_handler, NULL, NULL, APR_HOOK_MIDDLE);
@@ -1650,10 +1653,10 @@ static void ap_proxy_ftp_register_hook(apr_pool_t *p)
 
 module AP_MODULE_DECLARE_DATA proxy_ftp_module = {
     STANDARD20_MODULE_STUFF,
-    NULL,		/* create per-directory config structure */
-    NULL,		/* merge per-directory config structures */
-    NULL,		/* create per-server config structure */
-    NULL,		/* merge per-server config structures */
-    NULL,		/* command apr_table_t */
-    ap_proxy_ftp_register_hook	/* register hooks */
+    NULL,                       /* create per-directory config structure */
+    NULL,                       /* merge per-directory config structures */
+    NULL,                       /* create per-server config structure */
+    NULL,                       /* merge per-server config structures */
+    NULL,                       /* command apr_table_t */
+    ap_proxy_ftp_register_hook  /* register hooks */
 };
-- 
2.40.0