[patch] Upstream patch

moc-select.patch (text/plain), 1.35 KB, created by Petr Pisar on 2011-05-30 18:47:00 UTC

r2319 | jcf | 2011-05-23 02:03:02 +0200 (Po, 23 kvě 2011) | 9 lines

Provide CURL timeout so internet streaming errors don't hang MOC.

Thanks to: Daniel Stenberg
Resolves: http://moc.daper.net/node/242 and archlinux/FS#23193
Probably resolves: http://moc.daper.net/node/747 and 762
Probably partially resolves: http://moc.daper.net/node/779
Also see: https://bugs.archlinux.org/task/23193 and
          http://curl.haxx.se/mail/lib-2011-05/0155.html

Index: io_curl.c
===================================================================
--- io_curl.c	(revision 2318)
+++ io_curl.c	(revision 2319)
@@ -336,8 +336,9 @@
 				|| s->curl.multi_status == CURLM_OK)) {
 		if (s->curl.multi_status != CURLM_CALL_MULTI_PERFORM) {
 			fd_set read_fds, write_fds, exc_fds;
-			int max_fd;
-			int ret;
+			int max_fd, ret;
+			long milliseconds;
+			struct timeval timeout;
 
 			logit ("Doing select()...");
 
@@ -356,8 +357,14 @@
 			if (s->curl.wake_up_pipe[0] > max_fd)
 				max_fd = s->curl.wake_up_pipe[0];
 
+			curl_multi_timeout (s->curl.multi_handle, &milliseconds);
+			if (milliseconds <= 0)
+				milliseconds = 1000;
+			timeout.tv_sec = milliseconds / 1000;
+			timeout.tv_usec = (milliseconds % 1000) * 1000;
+
 			ret = select (max_fd + 1, &read_fds, &write_fds,
-					&exc_fds, NULL);
+					&exc_fds, &timeout);
 
 			if (ret < 0 && errno == EINTR) {
 				logit ("Interrupted");