[Pkg-php-commits] [php/debian-sid] remove debian patch curl_streams_sleep.patch

[Sean Finney]

fix incorporated upstream
---
 debian/patches/curl_streams_sleep.patch |   22 ----------------------
 debian/patches/series                   |    1 -
 2 files changed, 0 insertions(+), 23 deletions(-)
 delete mode 100644 debian/patches/curl_streams_sleep.patch

diff --git a/debian/patches/curl_streams_sleep.patch b/debian/patches/curl_streams_sleep.patch
deleted file mode 100644
index 2e604a2..0000000
--- a/debian/patches/curl_streams_sleep.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- php.orig/ext/curl/streams.c
-+++ php/ext/curl/streams.c
-@@ -167,7 +167,8 @@ static size_t php_curl_stream_read(php_s
- 			tv.tv_sec = 15; /* TODO: allow this to be configured from the script */
- 
- 			/* wait for data */
--			switch (select(curlstream->maxfd + 1, &curlstream->readfds, &curlstream->writefds, &curlstream->excfds, &tv)) {
-+			switch ((curlstream->maxfd < 0) ? 1 :
-+					select(curlstream->maxfd + 1, &curlstream->readfds, &curlstream->writefds, &curlstream->excfds, &tv)) {
- 				case -1:
- 					/* error */
- 					return 0;
-@@ -180,7 +181,8 @@ static size_t php_curl_stream_read(php_s
- 						curlstream->mcode = curl_multi_perform(curlstream->multi, &curlstream->pending);
- 					} while (curlstream->mcode == CURLM_CALL_MULTI_PERFORM);
- 			}
--		} while (curlstream->readbuffer.readpos >= curlstream->readbuffer.writepos && curlstream->pending > 0);
-+		} while (curlstream->maxfd >= 0 &&
-+				curlstream->readbuffer.readpos >= curlstream->readbuffer.writepos && curlstream->pending > 0);
- 
- 	}
- 
diff --git a/debian/patches/series b/debian/patches/series
index dd2bf52..f9b7c08 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,7 +35,6 @@ manpage_spelling.patch
 force_libmysqlclient_r.patch
 libedit_is_editline.patch
 bad_whatis_entries.patch
-curl_streams_sleep.patch
 gentoo/006_ext-curl-set_opt-crash.patch
 gentoo/009_ob-memory-leaks.patch
 mssql-null-exception.patch
-- 
1.5.6.5