summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor J. Orlikowski <orlikowski@apache.org>2001-06-28 22:40:51 +0200
committerVictor J. Orlikowski <orlikowski@apache.org>2001-06-28 22:40:51 +0200
commitfe91c29215b136ee40ac8ca5f68840fcd1b31f71 (patch)
treedf62bccc645ea025d2eeaf05b25a8064c5990c06
parentGet the messages returned from the FTP Server in order. (diff)
downloadapache2-fe91c29215b136ee40ac8ca5f68840fcd1b31f71.tar.xz
apache2-fe91c29215b136ee40ac8ca5f68840fcd1b31f71.zip
Use the variable we've been using for return codes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89480 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--modules/proxy/proxy_ftp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index dff676ff26..9db0751954 100644
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -1595,9 +1595,9 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
apr_socket_close(remote_sock);
ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
"proxy: FTP: Closing Data connection.");
- i = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
+ rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
- "proxy: FTP: %d %s", i, buffer);
+ "proxy: FTP: %d %s", rc, buffer);
apr_brigade_cleanup(bb);
ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
"proxy: FTP: end body send");
@@ -1620,9 +1620,9 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
/* 500 Syntax error, command unrecognized. */
/* 501 Syntax error in parameters or arguments. */
/* 502 Command not implemented. */
- i = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
+ rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
- "proxy: FTP: %d %s", i, buffer);
+ "proxy: FTP: %d %s", rc, buffer);
}
@@ -1647,9 +1647,9 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
/* responses: 221, 500 */
/* 221 Service closing control connection. */
/* 500 Syntax error, command unrecognized. */
- i = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
+ rc = ftp_getrc_msg(origin, cbb, buffer, sizeof(buffer));
ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
- "proxy: FTP: %d %s", i, buffer);
+ "proxy: FTP: %d %s", rc, buffer);
apr_socket_close(sock);
apr_brigade_destroy(bb);
return OK;