apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r604389 - in /apr/apr/trunk: include/apr_network_io.h network_io/unix/sockaddr.c
Date Sat, 15 Dec 2007 04:10:39 GMT
Author: wrowe
Date: Fri Dec 14 20:10:38 2007
New Revision: 604389

URL: http://svn.apache.org/viewvc?rev=604389&view=rev
Log:
Revert sockaddr.c all the way back to r428317, and discard
the IPv4 address resolution for APR_INET6 sockaddr resolution,
per Joe's objection and no other interest.


Modified:
    apr/apr/trunk/include/apr_network_io.h
    apr/apr/trunk/network_io/unix/sockaddr.c

Modified: apr/apr/trunk/include/apr_network_io.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_network_io.h?rev=604389&r1=604388&r2=604389&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_network_io.h (original)
+++ apr/apr/trunk/include/apr_network_io.h Fri Dec 14 20:10:38 2007
@@ -111,7 +111,6 @@
 
 #define APR_IPV4_ADDR_OK  0x01  /**< @see apr_sockaddr_info_get() */
 #define APR_IPV6_ADDR_OK  0x02  /**< @see apr_sockaddr_info_get() */
-#define APR_IPV6_V4MAPPED_OK 0x04 /**< @see apr_sockaddr_info_get() */
 
 #if (!APR_HAVE_IN_ADDR)
 /**
@@ -368,9 +367,6 @@
  *                                 only valid if family is APR_UNSPEC and hostname
  *                                 isn't NULL and APR_HAVE_IPV6; mutually exclusive
  *                                 with APR_IPV4_ADDR_OK
- *       APR_IPV6_V4MAPPED_OK      Used with family APR_INET6, if no matching
- *                                 IPv6 addresses could be matched, then 
- *                                 accept IPv4 addresses as mapped matches.
  * </PRE>
  * @param p The pool for the apr_sockaddr_t and associated storage.
  */

Modified: apr/apr/trunk/network_io/unix/sockaddr.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/network_io/unix/sockaddr.c?rev=604389&r1=604388&r2=604389&view=diff
==============================================================================
--- apr/apr/trunk/network_io/unix/sockaddr.c (original)
+++ apr/apr/trunk/network_io/unix/sockaddr.c Fri Dec 14 20:10:38 2007
@@ -344,11 +344,6 @@
         servname = apr_itoa(p, port);
 #endif /* OSF1 */
     }
-#if APR_HAVE_IPV6 && defined(AI_V4MAPPED)
-    if (flags & APR_IPV6_V4MAPPED_OK && family == APR_INET6) {
-        hints.ai_flags |= AI_V4MAPPED;
-    }
-#endif
     error = getaddrinfo(hostname, servname, &hints, &ai_list);
 #ifdef HAVE_GAI_ADDRCONFIG
     if (error == EAI_BADFLAGS && family == APR_UNSPEC) {
@@ -419,12 +414,6 @@
                                    apr_port_t port, apr_int32_t flags, 
                                    apr_pool_t *p)
 {
-#if APR_HAVE_IPV6
-    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