httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Guenter Knauf <fua...@apache.org>
Subject Re: svn commit: r601843 - in /httpd/mod_ftp/trunk: STATUS include/mod_ftp.h
Date Fri, 07 Dec 2007 18:51:46 GMT
Hi,
> Who's interested in seeing a T&R and helping make the release happen?
me. But current code doesnt compile for Ipv4 due to improper ifdefs in ftp_commands.c;
here's what makes it compile - however first hunk seems not nice...

--- ftp_commands.c.orig	Fri Dec 07 19:38:14 2007
+++ ftp_commands.c	Fri Dec 07 19:47:40 2007
@@ -1515,11 +1515,13 @@
             addr = c->local_ip;
             family = APR_INET;
         }
-#endif
         else {
+#endif
             addr = c->local_ip;
             family = c->local_addr->family;
+#if APR_HAVE_IPV6
         }
+#endif
     }
     else if (arg[0] == '1' && !arg[1]) {
         if (c->local_addr->family == AF_INET
@@ -1760,9 +1762,9 @@
     /* XXX: Anything special to handle IPv6 ip_addr string where c->remote_ip
      * is IPv4 mapped?
      */
-    if (((c->local_addr->family == APR_INET) && (family == APR_INET)) ||
+    if (((c->local_addr->family == APR_INET) && (family == APR_INET))
 #if APR_HAVE_IPV6
-            ((c->local_addr->family == APR_INET6) && (family == APR_INET6))
+            || ((c->local_addr->family == APR_INET6) && (family == APR_INET6))
 #endif
        ) {
         apr_sockaddr_info_get(&sa, c->local_ip, family,


then there's another issue with mod_ftp.c which I will soon look at....

Guenter.



Mime
View raw message