httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r1429865 - in /httpd/httpd/branches/2.4.x: ./ modules/proxy/mod_proxy_ftp.c
Date Mon, 07 Jan 2013 16:04:56 GMT
Author: jorton
Date: Mon Jan  7 16:04:56 2013
New Revision: 1429865

URL: http://svn.apache.org/viewvc?rev=1429865&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_ftp.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1423353,1428280

Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_ftp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_ftp.c?rev=1429865&r1=1429864&r2=1429865&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_ftp.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_ftp.c Mon Jan  7 16:04:56 2013
@@ -1465,7 +1465,7 @@ static int proxy_ftp_handler(request_rec
                                                                            "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;
                 }



Mime
View raw message