httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r806423 - in /httpd/mod_ftp/trunk: CHANGES-FTP modules/ftp/ftp_commands.c
Date Fri, 21 Aug 2009 05:34:49 GMT
Author: wrowe
Date: Fri Aug 21 05:34:49 2009
New Revision: 806423

URL: http://svn.apache.org/viewvc?rev=806423&view=rev
Log:
Correct orig_server persistance for JailUser

Modified:
    httpd/mod_ftp/trunk/CHANGES-FTP
    httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c

Modified: httpd/mod_ftp/trunk/CHANGES-FTP
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/CHANGES-FTP?rev=806423&r1=806422&r2=806423&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/CHANGES-FTP (original)
+++ httpd/mod_ftp/trunk/CHANGES-FTP Fri Aug 21 05:34:49 2009
@@ -1,6 +1,9 @@
 Changes in 0.9.5:
 
-  *) Correct RETR path handling to permit RETR path/foo [William Rowe]
+  *) Correct JailUser option, ensure the modified server config is
+     retained from request to request, between logins.  [William Rowe]
+
+  *) Correct RETR path handling to permit RETR path/foo.  [William Rowe]
 
   *) Escape output of user supplied text in control channel responses.
      Adds an ftp_escape_control_text() API for extention module authors.

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c?rev=806423&r1=806422&r2=806423&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c Fri Aug 21 05:34:49 2009
@@ -1139,11 +1139,6 @@
         return FTP_REPLY_BAD_SEQUENCE;
     }
 
-    /*
-     * Reset the possibly mauled ap_document_root and our cwd with each
-     * attempt to finish logging in.
-     */
-    r->server = fc->orig_server;
     apr_cpystrn(fc->cwd, "/", APR_PATH_MAX + 1);
 
     /*
@@ -1205,7 +1200,7 @@
             }
         }
         ftpserver->module_config = (ap_conf_vector_t *) conf_vector;
-        r->server = ftpserver;
+        fc->orig_server = r->server = ftpserver;
     }
 
     if (fsc->docrootenv) {



Mime
View raw message