You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mod_ftp-commits@incubator.apache.org by wr...@apache.org on 2007/02/10 23:23:10 UTC
svn commit: r505790 - /incubator/mod_ftp/trunk/modules/ftp/mod_ftp.c
Author: wrowe
Date: Sat Feb 10 15:23:06 2007
New Revision: 505790
URL: http://svn.apache.org/viewvc?view=rev&rev=505790
Log:
Fix trailing whitespace before munging this code, and fix the dir merge
before munging that code (note it's identical behavior, but definately
doesn't match the principal of least-surprise).
Modified:
incubator/mod_ftp/trunk/modules/ftp/mod_ftp.c
Modified: incubator/mod_ftp/trunk/modules/ftp/mod_ftp.c
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/modules/ftp/mod_ftp.c?view=diff&rev=505790&r1=505789&r2=505790
==============================================================================
--- incubator/mod_ftp/trunk/modules/ftp/mod_ftp.c (original)
+++ incubator/mod_ftp/trunk/modules/ftp/mod_ftp.c Sat Feb 10 15:23:06 2007
@@ -79,7 +79,7 @@
{
server_rec *base = s;
- ap_add_version_component(p, FTP_SERVER_STRING);
+ ap_add_version_component(p, FTP_SERVER_STRING);
/* Fixup base server and virtual host default values
*/
@@ -96,14 +96,14 @@
* for operation, exchange this with a positive protections
* to pass to the apr_file_open protection flag.
*/
- fsc->fileperms = (APR_UREAD | APR_UWRITE |
- APR_GREAD | APR_GWRITE |
- APR_WREAD | APR_WWRITE)
+ fsc->fileperms = (APR_UREAD | APR_UWRITE |
+ APR_GREAD | APR_GWRITE |
+ APR_WREAD | APR_WWRITE)
& ~fsc->fileperms;
fsc->dirperms = (APR_UREAD | APR_UWRITE | APR_UEXECUTE |
APR_GREAD | APR_GWRITE | APR_GEXECUTE |
- APR_WREAD | APR_WWRITE | APR_WEXECUTE)
+ APR_WREAD | APR_WWRITE | APR_WEXECUTE)
& ~fsc->dirperms;
if (fsc->timeout_login == FTP_UNSPEC)
@@ -256,11 +256,10 @@
ftp_dir_config *add = (ftp_dir_config *)addv;
ftp_dir_config *conf = apr_palloc(p, sizeof(*conf));
- /* We default to the add config, so any directive not
- * handled here won't be inherited through directories.
- * XXX: which happens to be stupid (unexpected) behavior.
- */
- memcpy (conf, add, sizeof(*conf));
+ /* NO-INHERIT the FTPReadmeMessage? */
+ conf->path = add->path;
+ conf->readme = add->readme;
+ conf->readme_isfile = add->readme_isfile;
/* TODO:
* if we adopt FTPUMask as a per-dir, we must blend it