pool/curl
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1008961 from home:vulyanov:branches:Virtualization

Browse Source 
- Update connection info when using UNIX socket as endpoint
  connect-fix-Curl_updateconninfo-for-TRNSPRT_UNIX.patch

OBS-URL: https://build.opensuse.org/request/show/1008961
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=319
This commit is contained in:
Pedro Monreal Gonzalez 2022-10-10 08:08:34 +00:00 committed by Git OBS Bridge
parent c9f82120ba
commit 881171ebca
3 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
connect-fix-Curl_updateconninfo-for-TRNSPRT_UNIX.patch Normal file
View File

@ -0,0 +1,42 @@
From 4232e1ac84ff4c2f46807b68a93efdbb31ff22a2 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 7 Oct 2022 18:10:05 +0200
Subject: [PATCH] connect: fix Curl_updateconninfo for TRNSPRT_UNIX
Reported-by: Vasiliy Ulyanov
Fixes #9664
Closes #9670
---
lib/connect.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/lib/connect.c b/lib/connect.c
index c1d8cfd39..9dc14704d 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -762,18 +762,10 @@ void Curl_updateconninfo(struct Curl_easy *data, struct connectdata *conn,
char local_ip[MAX_IPADR_LEN] = "";
int local_port = -1;
- if(conn->transport == TRNSPRT_TCP) {
- if(!conn->bits.reuse && !conn->bits.tcp_fastopen)
- Curl_conninfo_remote(data, conn, sockfd);
- Curl_conninfo_local(data, sockfd, local_ip, &local_port);
- } /* end of TCP-only section */
-#ifdef ENABLE_QUIC
- else if(conn->transport == TRNSPRT_QUIC) {
- if(!conn->bits.reuse)
- Curl_conninfo_remote(data, conn, sockfd);
- Curl_conninfo_local(data, sockfd, local_ip, &local_port);
- }
-#endif
+ if(!conn->bits.reuse &&
+ (conn->transport != TRNSPRT_TCP || !conn->bits.tcp_fastopen))
+ Curl_conninfo_remote(data, conn, sockfd);
+ Curl_conninfo_local(data, sockfd, local_ip, &local_port);
/* persist connection info in session handle */
Curl_persistconninfo(data, conn, local_ip, local_port);
--
2.37.3

6
curl.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Oct 8 17:06:50 UTC 2022 - Vasily Ulyanov <vasily.ulyanov@suse.com>
- Update connection info when using UNIX socket as endpoint
connect-fix-Curl_updateconninfo-for-TRNSPRT_UNIX.patch
-------------------------------------------------------------------
Wed Aug 31 07:34:20 UTC 2022 - Pedro Monreal <pmonreal@suse.com>

1
curl.spec
View File

@ -35,6 +35,7 @@ Patch1: dont-mess-with-rpmoptflags.patch
Patch2: curl-secure-getenv.patch
#PATCH-FIX-OPENSUSE bsc#1076446 protocol redirection not supported or disabled
Patch3: curl-disabled-redirect-protocol-message.patch
Patch4: connect-fix-Curl_updateconninfo-for-TRNSPRT_UNIX.patch
BuildRequires: libtool
BuildRequires: pkgconfig
Requires: libcurl4 = %{version}