apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r603350 - /apr/apr/trunk/network_io/unix/sockaddr.c
Date Tue, 11 Dec 2007 20:34:20 GMT
Author: wrowe
Date: Tue Dec 11 12:34:19 2007
New Revision: 603350

URL: http://svn.apache.org/viewvc?rev=603350&view=rev
Log:
irrespective of if we back this out, prevent doubled resolver calls.

In fact, there's no use for the else {} condition at all.

Modified:
    apr/apr/trunk/network_io/unix/sockaddr.c

Modified: apr/apr/trunk/network_io/unix/sockaddr.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/network_io/unix/sockaddr.c?rev=603350&r1=603349&r2=603350&view=diff
==============================================================================
--- apr/apr/trunk/network_io/unix/sockaddr.c (original)
+++ apr/apr/trunk/network_io/unix/sockaddr.c Tue Dec 11 12:34:19 2007
@@ -420,10 +420,11 @@
                                    apr_pool_t *p)
 {
 #if APR_HAVE_IPV6
-    if (flags & APR_IPV4_ADDR_OK && family == APR_INET6) {
-        apr_status_t error = call_resolver(sa, hostname, family, port, flags, p);
-    } else
+    if (flags & APR_IPV6_V4MAPPED_OK && family == APR_INET6) {
+        return call_resolver(sa, hostname, family, port, flags, p);
+    }
 #endif
+
     if (flags & APR_IPV4_ADDR_OK) {
         apr_status_t error = call_resolver(sa, hostname, AF_INET, port, flags, p);
 



Mime
View raw message