httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r806285 - /httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
Date Thu, 20 Aug 2009 18:16:44 GMT
Author: wrowe
Date: Thu Aug 20 18:16:44 2009
New Revision: 806285

URL: http://svn.apache.org/viewvc?rev=806285&view=rev
Log:
Simplify, consistant with cmd_retr

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

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=806285&r1=806284&r2=806285&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c Thu Aug 20 18:16:44 2009
@@ -2501,7 +2501,6 @@
     apr_status_t rv, res;
     apr_bucket_brigade *bb;
     apr_int32_t openflag;
-    const char *reply;
     char *buffer;
     apr_off_t total = 0;
     apr_size_t len;
@@ -2624,10 +2623,11 @@
     }
     fc->restart_point = 0;
 
-    reply = apr_psprintf(r->pool, "Opening %s mode data connection for %s",
-                         fc->type == TYPE_A ? "ASCII" : "BINARY", arg);
-    ftp_reply(fc, c->output_filters, r->pool, FTP_REPLY_FILE_STATUS_OK,
-              0, reply);
+    ftp_reply(fc, c->output_filters, r->pool, FTP_REPLY_FILE_STATUS_OK, 0,
+              apr_pstrcat(r->pool, "Opening ",
+                          (fc->type == TYPE_A) ? "ASCII" : "BINARY",
+                          " mode data connection for ", 
+                          ftp_escape_control_text(arg, r->pool), NULL));
 
     /*
      * Open the data connection to the client



Mime
View raw message