httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1633355 - /httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
Date Tue, 21 Oct 2014 12:05:44 GMT
Author: wrowe
Date: Tue Oct 21 12:05:43 2014
New Revision: 1633355

URL: http://svn.apache.org/r1633355
Log:
Fix AIX compile error for ap_log_error macro, similar to PR 52394

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=1633355&r1=1633354&r2=1633355&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c Tue Oct 21 12:05:43 2014
@@ -1854,11 +1854,13 @@ static int ftp_cmd_eprt(request_rec *r, 
     rv = apr_sockaddr_info_get(&fc->clientsa, ip_addr, family,
                                port, 0, fc->data_pool);
     if (!fc->clientsa || rv) {
+#if APR_HAVE_IPV6
         ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
                      "Unable to resolve EPRT address of |%d|%s|%d|",
-#if APR_HAVE_IPV6
                      (family == APR_INET6) ? 2 : 1, ip_addr, port);
 #else
+        ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
+                     "Unable to resolve EPRT address of |%d|%s|%d|",
                      1, ip_addr, port);
 #endif
         fc->response_notes = "Invalid EPRT command, unable to resolve request";



Mime
View raw message