apr-util ver. bump

2023-02-10 18:08:52 +03:00
parent 5eca9fd032
commit 3043be0c99
2 changed files with 46 additions and 0 deletions
@@ -0,0 +1,43 @@
+From 828d644c8eba8765843985d9293f033898ed0592 Mon Sep 17 00:00:00 2001
+From: Joe Orton <jorton@apache.org>
+Date: Fri, 3 Feb 2023 15:12:10 +0000
+Subject: [PATCH] * memcache/apr_memcache.c (conn_connect): Allow use of IPv6  
+ rather than forcing name resolution to IPv4 only.
+
+Submitted by: Lubos Uhliarik <luhliari redhat.com>
+Github: closes #39
+
+
+git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1907242 13f79535-47bb-0310-9956-ffa450edef68
+---
+ memcache/apr_memcache.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/memcache/apr_memcache.c b/memcache/apr_memcache.c
+index 5f8135c52c..18806281a4 100644
+--- a/memcache/apr_memcache.c
+++ b/memcache/apr_memcache.c
+@@ -290,9 +290,9 @@ static apr_status_t conn_connect(apr_memcache_conn_t *conn)
+     apr_status_t rv = APR_SUCCESS;
+     apr_sockaddr_t *sa;
+ #if APR_HAVE_SOCKADDR_UN
+-    apr_int32_t family = conn->ms->host[0] != '/' ? APR_INET : APR_UNIX;
+    apr_int32_t family = conn->ms->host[0] != '/' ? APR_UNSPEC : APR_UNIX;
+ #else
+-    apr_int32_t family = APR_INET;
+    apr_int32_t family = APR_UNSPEC;
+ #endif
+ 
+     rv = apr_sockaddr_info_get(&sa, conn->ms->host, family, conn->ms->port, 0, conn->p);
+@@ -328,9 +328,9 @@ mc_conn_construct(void **conn_, void *params, apr_pool_t *pool)
+     apr_pool_t *tp;
+     apr_memcache_server_t *ms = params;
+ #if APR_HAVE_SOCKADDR_UN
+-    apr_int32_t family = ms->host[0] != '/' ? APR_INET : APR_UNIX;
+    apr_int32_t family = ms->host[0] != '/' ? APR_UNSPEC : APR_UNIX;
+ #else
+-    apr_int32_t family = APR_INET;
+    apr_int32_t family = APR_UNSPEC;
+ #endif
+ 
+     rv = apr_pool_create(&np, pool);
@@ -27,6 +27,9 @@
            <Dependency>cyrus-sasl-devel</Dependency>
            <Dependency versionFrom="2.4.41">openldap-client</Dependency>
        </BuildDependencies>
+        <Patches>
+            <Patch level="1">apr-util-1.6.3-allow-ipv6.patch</Patch>
+        </Patches>
    </Source>

    <Package>