Merged r1423353, r1428280 from trunk:

* modules/proxy/mod_proxy_ftp.c: Fill in APLOGNO.

* modules/proxy/mod_proxy_ftp.c (proxy_ftp_handler): Remove
  unnecessary APLOGNO() for trace logging per dev@ discussion.

Reviewed by: jorton, covener, sf

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1429865 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/proxy/mod_proxy_ftp.c b/modules/proxy/mod_proxy_ftp.c
index 59a3dd42e4491ffdaf124c2d59702bf75cf89472..680be8b802694864cceb7a56a6e9fc5816589a77 100644 (file)
--- a/modules/proxy/mod_proxy_ftp.c
+++ b/modules/proxy/mod_proxy_ftp.c
@@ -1465,7 +1465,7 @@ static int proxy_ftp_handler(request_rec *r, proxy_worker *worker,
                                                                            "EPSV attempt to connect to %pI failed - firewall/NAT?", &epsv_addr));
                 }
                 else {
-                    ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, APLOGNO()
+                    ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r,
                                   "connected data socket to %pI", &epsv_addr);
                     connect = 1;
                 }