[curl/f20] Resolves: #1066484 - use proxy name in error messages when proxy is used

[Kamil Dudka]

commit 617879d1e60cdaae52826dc1f38ca9da5b718800
Author: Kamil Dudka <kdudka at redhat.com>
Date:   Tue Feb 25 13:09:47 2014 +0100

    Resolves: #1066484 - use proxy name in error messages when proxy is used

 0006-curl-7.32.0-1cf71bd7.patch |   34 ++++++++++++++++++++++++++++++++++
 curl.spec                       |    5 +++++
 2 files changed, 39 insertions(+), 0 deletions(-)
---
diff --git a/0006-curl-7.32.0-1cf71bd7.patch b/0006-curl-7.32.0-1cf71bd7.patch
new file mode 100644
index 0000000..f6d5e57
--- /dev/null
+++ b/0006-curl-7.32.0-1cf71bd7.patch
@@ -0,0 +1,34 @@
+From b5794155ef02e633a16581397facd599d3190728 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel at haxx.se>
+Date: Wed, 4 Dec 2013 22:46:49 +0100
+Subject: [PATCH] Curl_is_connected: use proxy name in error message when proxy is used
+
+(bug introduced in 255826c4, never present in a release)
+
+Reported-by: Dima Tisnek
+Bug: http://curl.haxx.se/mail/lib-2013-12/0006.html
+
+[upstream commit 1cf71bd76e4a330e5b7824014c2605e4bfe1a0a5]
+
+Signed-off-by: Kamil Dudka <kdudka at redhat.com>
+---
+ lib/connect.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/lib/connect.c b/lib/connect.c
+index 2b5719d..413c66e 100644
+--- a/lib/connect.c
++++ b/lib/connect.c
+@@ -821,7 +821,8 @@ CURLcode Curl_is_connected(struct connectdata *conn,
+     error = SOCKERRNO;
+     data->state.os_errno = error;
+     failf(data, "Failed connect to %s:%ld; %s",
+-          conn->host.name, conn->port, Curl_strerror(conn, error));
++          conn->bits.proxy?conn->proxy.name:conn->host.name,
++          conn->port, Curl_strerror(conn, error));
+   }
+ 
+   return code;
+-- 
+1.7.1
+
diff --git a/curl.spec b/curl.spec
index 825daee..6d8b0bb 100644
--- a/curl.spec
+++ b/curl.spec
@@ -22,6 +22,9 @@ Patch4: 0004-curl-7.32.0-ffb8a21d.patch
 # ssh: improve the logic for detecting blocking direction
 Patch5: 0005-curl-7.32.0-d015f4cc.patch
 
+# use proxy name in error messages when proxy is used (#1066484)
+Patch6: 0006-curl-7.32.0-1cf71bd7.patch
+
 # patch making libcurl multilib ready
 Patch101: 0101-curl-7.32.0-multilib.patch
 
@@ -124,6 +127,7 @@ documentation of the library, too.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # Fedora patches
 %patch101 -p1
@@ -244,6 +248,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Feb 25 2014 Kamil Dudka <kdudka at redhat.com> 7.32.0-5
 - refresh expired cookie in test172 from upstream test-suite (#1068967)
+- use proxy name in error messages when proxy is used (#1066484)
 
 * Fri Jan 31 2014 Kamil Dudka <kdudka at redhat.com> 7.32.0-4
 - re-use of wrong HTTP NTLM connection in libcurl (CVE-2014-0015)