commit b5930d63d2e2c14b8fdce243d6306142dc5260f6
author Joe Orton <jorton@apache.org> Tue Jun 27 14:09:18 2023 +0000
committer Joe Orton <jorton@apache.org> Tue Jun 27 14:09:18 2023 +0000
tree c495b98550a84d07f29520599254b9ea3518c25c
parent cbb4cccdc89c0fbb3194c087011136b8855f5419

Merge r1910629 from trunk:

* memcache/apr_memcache.c (conn_connect, mc_conn_construct): Fix
  regression in IPv4 handling in r1907242. Cycle through the address
  list handling v4/v6 addresses correctly.

Submitted by: Lubos Uhliarik <luhliari redhat.com>
Github: closes #44


git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.6.x@1910631 13f79535-47bb-0310-9956-ffa450edef68

memcache/apr_memcache.c

diff --git a/memcache/apr_memcache.c b/memcache/apr_memcache.c
index ab5ea83..2c7bd1d 100644
--- a/memcache/apr_memcache.c
+++ b/memcache/apr_memcache.c
@@ -300,14 +300,26 @@
         return rv;
     }
 
-    rv = apr_socket_timeout_set(conn->sock, 1 * APR_USEC_PER_SEC);
-    if (rv != APR_SUCCESS) {
-        return rv;
+    /* Cycle through address until a connect() succeeds. */
+    for (; sa; sa = sa->next) {
+        rv = apr_socket_create(&conn->sock, sa->family, SOCK_STREAM, 0, conn->p);
+        if (rv == APR_SUCCESS) {
+            rv = apr_socket_timeout_set(conn->sock, 1 * APR_USEC_PER_SEC);
+            if (rv != APR_SUCCESS) {
+                return rv;
+            }
+
+            rv = apr_socket_connect(conn->sock, sa);
+            if (rv == APR_SUCCESS) {
+                break;
+            }
+
+            apr_socket_close(conn->sock);
+        }
     }
 
-    rv = apr_socket_connect(conn->sock, sa);
-    if (rv != APR_SUCCESS) {
-        return rv;
+    if (!sa) {
+        return APR_ECONNREFUSED;
     }
 
     rv = apr_socket_timeout_set(conn->sock, -1);
@@ -327,11 +339,6 @@
     apr_pool_t *np;
     apr_pool_t *tp;
     apr_memcache_server_t *ms = params;
-#if APR_HAVE_SOCKADDR_UN
-    apr_int32_t family = ms->host[0] != '/' ? APR_UNSPEC : APR_UNIX;
-#else
-    apr_int32_t family = APR_UNSPEC;
-#endif
 
     rv = apr_pool_create(&np, pool);
     if (rv != APR_SUCCESS) {
@@ -349,13 +356,6 @@
     conn->p = np;
     conn->tp = tp;
 
-    rv = apr_socket_create(&conn->sock, family, SOCK_STREAM, 0, np);
-
-    if (rv != APR_SUCCESS) {
-        apr_pool_destroy(np);
-        return rv;
-    }
-
     conn->buffer = apr_palloc(conn->p, BUFFER_SIZE + 1);
     conn->blen = 0;
     conn->ms = ms;