Common subdirectories: moc-2.4.4/decoder_plugins and moc-2.4.4-daniel/decoder_plugins
Common subdirectories: moc-2.4.4/doxy_pages and moc-2.4.4-daniel/doxy_pages
diff -u moc-2.4.4/io_curl.c moc-2.4.4-daniel/io_curl.c
--- moc-2.4.4/io_curl.c	2007-07-08 08:54:45.000000000 +0200
+++ moc-2.4.4-daniel/io_curl.c	2011-05-18 09:09:40.000000000 +0200
@@ -338,6 +338,8 @@
 			fd_set read_fds, write_fds, exc_fds;
 			int max_fd;
 			int ret;
+                        long milliseconds;
+                        struct timeval timeout;
 
 			logit ("Doing select()...");
 
@@ -356,8 +358,14 @@
 			if (s->curl.wake_up_pipe[0] > max_fd)
 				max_fd = s->curl.wake_up_pipe[0];
 
+                        curl_multi_time(s->curl.multi_handle, &milliseconds);
+                        if(milliseconds <= 0)
+                          milliseconds = 1000; /* just a cautionary default */
+                        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");
Only in moc-2.4.4-daniel: io_curl.c~
Common subdirectories: moc-2.4.4/libltdl and moc-2.4.4-daniel/libltdl
Common subdirectories: moc-2.4.4/m4 and moc-2.4.4-daniel/m4
Common subdirectories: moc-2.4.4/themes and moc-2.4.4-daniel/themes
