[gnash] Drop a hunk of the upstream patch which does not apply to 0.8.8 (removes code which is already not t
Kevin Kofler
kkofler at fedoraproject.org
Wed Oct 6 04:49:04 UTC 2010
commit 1312d988673e76f42d4b0737b5cc247dd76d5847
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Wed Oct 6 06:48:59 2010 +0200
Drop a hunk of the upstream patch which does not apply to 0.8.8 (removes code
which is already not there).
gnash-0.8.8-libcurl721-FD_ZERO.patch | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
---
diff --git a/gnash-0.8.8-libcurl721-FD_ZERO.patch b/gnash-0.8.8-libcurl721-FD_ZERO.patch
index 837f378..52e915b 100644
--- a/gnash-0.8.8-libcurl721-FD_ZERO.patch
+++ b/gnash-0.8.8-libcurl721-FD_ZERO.patch
@@ -3,23 +3,14 @@ From: Sandro Santilli <strk at keybit.net>
Date: Sun, 03 Oct 2010 20:13:27 +0000
Subject: FD_ZERO should not be called between curl_multi_fset and select...
+(Backported to 0.8.8 by Kevin Kofler: first hunk omitted.)
+
---
diff --git a/libbase/curl_adapter.cpp b/libbase/curl_adapter.cpp
index 4604bee..b1caf8a 100644
--- a/libbase/curl_adapter.cpp
+++ b/libbase/curl_adapter.cpp
-@@ -607,10 +607,6 @@ CurlStreamFile::fillCache(std::streamsize size)
- }
-
- fd_set readfd, writefd, exceptfd;
-- FD_ZERO(&readfd);
-- FD_ZERO(&writefd);
-- FD_ZERO(&exceptfd);
--
- int maxfd;
- CURLMcode mcode;
- timeval tv;
-@@ -642,6 +638,11 @@ CurlStreamFile::fillCache(std::streamsize size)
+@@ -642,6 +642,11 @@ CurlStreamFile::fillCache(std::streamsize size)
//log_debug("cached: %d, size: %d", _cached, size);
#endif
@@ -31,7 +22,7 @@ index 4604bee..b1caf8a 100644
mcode = curl_multi_fdset(_mhandle, &readfd, &writefd,
&exceptfd, &maxfd);
-@@ -663,10 +664,6 @@ CurlStreamFile::fillCache(std::streamsize size)
+@@ -663,10 +668,6 @@ CurlStreamFile::fillCache(std::streamsize size)
break;
}
More information about the scm-commits
mailing list