martin 99/04/07 07:31:22
Modified: src CHANGES
src/modules/proxy proxy_ftp.c
Log:
proxy ftp: instead of using the hardwired string "text/plain" as
a fallback type for files served by the ftp proxy, use the
ap_default_type() function to determine the configured type.
This allows for special configurations like
<Directory proxy:ftp://some.host>
DefaultType gargle/blurb
</Directory>
Additionally, add the Content-Encoding: header to FTP proxy replies
when the encoding is defined (by the AddEncoding directive).
Because it was missing, it was almost impossible to browse compressed
files using the FTP proxy (works now perfectly in Communicator).
Revision Changes Path
1.1298 +13 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1297
retrieving revision 1.1298
diff -u -r1.1297 -r1.1298
--- CHANGES 1999/04/05 20:53:07 1.1297
+++ CHANGES 1999/04/07 14:31:19 1.1298
@@ -1,5 +1,18 @@
Changes with Apache 1.3.7
+ *) proxy ftp: instead of using the hardwired string "text/plain" as
+ a fallback type for files served by the ftp proxy, use the
+ ap_default_type() function to determine the configured type.
+ This allows for special configurations like
+ <Directory proxy:ftp://some.host>
+ DefaultType gargle/blurb
+ </Directory>
+ Additionally, add the Content-Encoding: header to FTP proxy replies
+ when the encoding is defined (by the AddEncoding directive).
+ Because it was missing, it was almost impossible to browse compressed
+ files using the FTP proxy (works now perfectly in Communicator).
+ [Martin Kraemer]
+
*) Be more smart in APACI's configure script when determining the UID/GID
for User/Group directives and use the determined UID/GID to initialize
the permissions on the proxycachedir.
1.72 +5 -1 apache-1.3/src/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_ftp.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- proxy_ftp.c 1999/03/10 17:42:46 1.71
+++ proxy_ftp.c 1999/04/07 14:31:21 1.72
@@ -1132,13 +1132,17 @@
Explain1("FTP: Content-Type set to %s", r->content_type);
}
else {
- ap_table_set(resp_hdrs, "Content-Type", "text/plain");
+ ap_table_set(resp_hdrs, "Content-Type", ap_default_type(r));
}
if (parms[0] != 'a' && size != NULL) {
/* We "trust" the ftp server to really serve (size) bytes... */
ap_table_set(resp_hdrs, "Content-Length", size);
Explain1("FTP: Content-Length set to %s", size);
}
+ }
+ if (r->content_encoding != NULL && r->content_encoding[0] != '\0') {
+ Explain1("FTP: Content-Encoding set to %s", r->content_encoding);
+ ap_table_set(resp_hdrs, "Content-Encoding", r->content_encoding);
}
/* check if NoCache directive on this host */
