- fix curl_multi_perform() over a proxy (#450140), thanks to Rob Crittenden
This commit is contained in:
parent
45696b40ef
commit
bf70a54550
13
curl-7.18.2-nssproxy.patch
Normal file
13
curl-7.18.2-nssproxy.patch
Normal file
@ -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;
|
@ -1,13 +1,14 @@
|
|||||||
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
|
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
|
||||||
Name: curl
|
Name: curl
|
||||||
Version: 7.18.2
|
Version: 7.18.2
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: Applications/Internet
|
Group: Applications/Internet
|
||||||
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
|
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
|
||||||
Patch1: curl-7.15.3-multilib.patch
|
Patch1: curl-7.15.3-multilib.patch
|
||||||
Patch2: curl-7.16.0-privlibs.patch
|
Patch2: curl-7.16.0-privlibs.patch
|
||||||
Patch3: curl-7.17.1-badsocket.patch
|
Patch3: curl-7.17.1-badsocket.patch
|
||||||
|
Patch4: curl-7.18.2-nssproxy.patch
|
||||||
Provides: webclient
|
Provides: webclient
|
||||||
URL: http://curl.haxx.se/
|
URL: http://curl.haxx.se/
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
@ -48,6 +49,7 @@ use cURL's capabilities internally.
|
|||||||
%patch1 -p1 -b .multilib
|
%patch1 -p1 -b .multilib
|
||||||
%patch2 -p1 -b .privlibs
|
%patch2 -p1 -b .privlibs
|
||||||
%patch3 -p1 -b .badsocket
|
%patch3 -p1 -b .badsocket
|
||||||
|
%patch4 -p1 -b .nssproxy
|
||||||
|
|
||||||
# Convert docs to UTF-8
|
# Convert docs to UTF-8
|
||||||
for f in CHANGES README; do
|
for f in CHANGES README; do
|
||||||
@ -115,6 +117,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_datadir}/aclocal/libcurl.m4
|
%{_datadir}/aclocal/libcurl.m4
|
||||||
|
|
||||||
%changelog
|
%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
|
* Wed Jun 4 2008 Jindrich Novy <jnovy@redhat.com> 7.18.2-1
|
||||||
- update to 7.18.2
|
- update to 7.18.2
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user