From bf70a545502bf070eebc68d350f921a5267540b6 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@fedoraproject.org>
Date: Wed, 18 Jun 2008 06:08:03 +0000
Subject: [PATCH] - fix curl_multi_perform() over a proxy (#450140), thanks to
 Rob Crittenden

---
 curl-7.18.2-nssproxy.patch | 13 +++++++++++++
 curl.spec                  |  8 +++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 curl-7.18.2-nssproxy.patch

diff --git a/curl-7.18.2-nssproxy.patch b/curl-7.18.2-nssproxy.patch
new file mode 100644
index 0000000..9d88d02
--- /dev/null
+++ b/curl-7.18.2-nssproxy.patch
@@ -0,0 +1,13 @@
+diff -up curl-7.18.2/lib/nss.c.nssproxy curl-7.18.2/lib/nss.c
+--- curl-7.18.2/lib/nss.c.nssproxy	2008-05-26 17:02:49.000000000 +0200
++++ curl-7.18.2/lib/nss.c	2008-06-18 07:59:52.000000000 +0200
+@@ -804,6 +804,9 @@ CURLcode Curl_nss_connect(struct connect
+ 
+   curlerr = CURLE_SSL_CONNECT_ERROR;
+ 
++  if (connssl->state == ssl_connection_complete)
++    return CURLE_OK;
++
+   /* FIXME. NSS doesn't support multiple databases open at the same time. */
+   if(!initialized) {
+     initialized = 1;
diff --git a/curl.spec b/curl.spec
index bb48c80..93424a5 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,13 +1,14 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.18.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
 Patch1: curl-7.15.3-multilib.patch
 Patch2: curl-7.16.0-privlibs.patch
 Patch3: curl-7.17.1-badsocket.patch
+Patch4: curl-7.18.2-nssproxy.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,6 +49,7 @@ use cURL's capabilities internally.
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .privlibs
 %patch3 -p1 -b .badsocket
+%patch4 -p1 -b .nssproxy
 
 # Convert docs to UTF-8
 for f in CHANGES README; do
@@ -115,6 +117,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Jun 18 2008 Jindrich Novy <jnovy@redhat.com> 7.18.2-2
+- fix curl_multi_perform() over a proxy (#450140), thanks to
+  Rob Crittenden
+
 * Wed Jun  4 2008 Jindrich Novy <jnovy@redhat.com> 7.18.2-1
 - update to 7.18.2