memcache/apr_memcache.c (conn_connect): Allow use of IPv6
This commit is contained in:
parent
70b82bb443
commit
c3d05badc4
43
apr-util-1.6.3-allow-ipv6.patch
Normal file
43
apr-util-1.6.3-allow-ipv6.patch
Normal file
@ -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);
|
@ -25,12 +25,13 @@
|
|||||||
Summary: Apache Portable Runtime Utility library
|
Summary: Apache Portable Runtime Utility library
|
||||||
Name: apr-util
|
Name: apr-util
|
||||||
Version: 1.6.3
|
Version: 1.6.3
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: https://apr.apache.org/
|
URL: https://apr.apache.org/
|
||||||
Source0: https://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
|
Source0: https://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
|
||||||
Patch1: apr-util-1.2.7-pkgconf.patch
|
Patch1: apr-util-1.2.7-pkgconf.patch
|
||||||
Patch2: apr-util-1.4.1-private.patch
|
Patch2: apr-util-1.4.1-private.patch
|
||||||
|
Patch3: apr-util-1.6.3-allow-ipv6.patch
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: autoconf, apr-devel >= 1.3.0
|
BuildRequires: autoconf, apr-devel >= 1.3.0
|
||||||
BuildRequires: %{dbdep}, expat-devel, libuuid-devel
|
BuildRequires: %{dbdep}, expat-devel, libuuid-devel
|
||||||
@ -133,6 +134,7 @@ This package provides the NSS crypto support for the apr-util.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1 -b .pkgconf
|
%patch1 -p1 -b .pkgconf
|
||||||
%patch2 -p1 -b .private
|
%patch2 -p1 -b .private
|
||||||
|
%patch3 -p1 -b .r1907541
|
||||||
|
|
||||||
: Configured for LDAP library: %{ldaplib}
|
: Configured for LDAP library: %{ldaplib}
|
||||||
|
|
||||||
@ -230,6 +232,9 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}/apr-util-%{apuver}
|
|||||||
%{_datadir}/aclocal/*.m4
|
%{_datadir}/aclocal/*.m4
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Feb 10 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.6.3-2
|
||||||
|
- memcache/apr_memcache.c (conn_connect): Allow use of IPv6
|
||||||
|
|
||||||
* Thu Feb 02 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.6.3-1
|
* Thu Feb 02 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.6.3-1
|
||||||
- new version 1.6.3
|
- new version 1.6.3
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user