svn commit: r603679 - /httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c

[wr...@apache.org]

Author: wrowe
Date: Wed Dec 12 09:33:30 2007
New Revision: 603679

URL: http://svn.apache.org/viewvc?rev=603679&view=rev
Log:
These two elements belong within ftp_initialize_connection

Modified:
    httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c?rev=603679&r1=603678&r2=603679&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c Wed Dec 12 09:33:30 2007
@@ -34,9 +34,6 @@
  */
 static void initialize_ftp_connection(conn_rec *c, ftp_connection *fc)
 {
-    ftp_server_config *fsc =
-      ftp_get_module_config(c->base_server->module_config);
-
     /* The ftp_connection structure is calloc'ed so only initalize
      * the members that we need to. */
 
@@ -47,6 +44,9 @@
     fc->cwd              = "/";
     fc->type             = TYPE_A;
     fc->passive_created  = -1;
+
+    fc->orig_server      = c->base_server;
+    fc->cntlsock = ap_get_module_config(c->conn_config, &core_module);
 }
 
 /* ftp_ssl_init: Fakes a read on the SSL filters to force initialization.
@@ -165,8 +165,6 @@
      */
     fc = apr_pcalloc(c->pool, sizeof(*fc));
     initialize_ftp_connection(c, fc);
-    fc->orig_server = c->base_server;
-    fc->cntlsock = client_socket;
 
     /* Check for implicit security on the control connection */
     if (!fsc->implicit_ssl) {