Commit 7121d142 authored by Christophe Jaillet's avatar Christophe Jaillet
Browse files

Save some cycle.

There is no need to copy, strchr, strcmp and modify a string which is only used for TRACE2 logging.

Note that the code that looks similar a few lines below can not be optimized the same way because it is also returned in 'pmessage'.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1838318 13f79535-47bb-0310-9956-ffa450edef68
parent 16c0872b
Loading
Loading
Loading
Loading
+3 −1
Changes for modules/proxy/mod_proxy_ftp.c: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -813,6 +813,7 @@ proxy_ftp_command(const char *cmd, request_rec *r, conn_rec *ftp_ctrl,
        APR_BRIGADE_INSERT_TAIL(bb, apr_bucket_flush_create(c->bucket_alloc));
        ap_pass_brigade(ftp_ctrl->output_filters, bb);

        if (APLOGrtrace2(r)) {
            /* strip off the CRLF for logging */
            apr_cpystrn(message, cmd, sizeof(message));
            if ((crlf = strchr(message, '\r')) != NULL ||
@@ -822,8 +823,9 @@ proxy_ftp_command(const char *cmd, request_rec *r, conn_rec *ftp_ctrl,
                strcpy(&message[5], "****");
            ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r, ">%s", message);
        }
    }

    rc = ftp_getrc_msg(ftp_ctrl, bb, message, sizeof message);
    rc = ftp_getrc_msg(ftp_ctrl, bb, message, sizeof(message));
    if (rc == -1 || rc == 421)
        strcpy(message,"<unable to read result>");
    if ((crlf = strchr(message, '\r')) != NULL ||