You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2011/03/21 21:38:58 UTC
svn commit: r1083949 - in /apr/apr/branches/1.4.x: CHANGES
network_io/unix/sockaddr.c
Author: trawick
Date: Mon Mar 21 20:38:57 2011
New Revision: 1083949
URL: http://svn.apache.org/viewvc?rev=1083949&view=rev
Log:
Merge r1083931 from trunk:
use apr_get_netos_error() to retrieve the getaddrinfo() error
code on Windows
before:
error: 681001/APR does not understand this error code
after:
error: 731001/No such host is known.
(the latter matches an IPv4-only build)
Submitted by: Ivan Zhakov <ivan visualsvn.com>
Reviewed by: trawick
Modified:
apr/apr/branches/1.4.x/CHANGES
apr/apr/branches/1.4.x/network_io/unix/sockaddr.c
Modified: apr/apr/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?rev=1083949&r1=1083948&r2=1083949&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.4.x/CHANGES [utf-8] Mon Mar 21 20:38:57 2011
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes for APR 1.4.3
+ *) Fix error return values from apr_sockaddr_info_get() on Windows for
+ IPv6 builds. [Ivan Zhakov <ivan visualsvn.com>]
+
*) Add new experimental configure option --enable-allocator-uses-mmap to
use mmap instead of malloc in apr_allocator_alloc(). This greatly reduces
memory fragmentation with malloc implementations (e.g. glibc) that
Modified: apr/apr/branches/1.4.x/network_io/unix/sockaddr.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/network_io/unix/sockaddr.c?rev=1083949&r1=1083948&r2=1083949&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/network_io/unix/sockaddr.c (original)
+++ apr/apr/branches/1.4.x/network_io/unix/sockaddr.c Mon Mar 21 20:38:57 2011
@@ -363,12 +363,13 @@ static apr_status_t call_resolver(apr_so
}
#endif
if (error) {
-#ifndef WIN32
+#if defined(WIN32)
+ return apr_get_netos_error();
+#else
if (error == EAI_SYSTEM) {
return errno;
}
else
-#endif
{
/* issues with representing this with APR's error scheme:
* glibc uses negative values for these numbers, perhaps so
@@ -380,6 +381,7 @@ static apr_status_t call_resolver(apr_so
#endif
return error + APR_OS_START_EAIERR;
}
+#endif /* WIN32 */
}
prev_sa = NULL;