# HG changeset patch
# User nenolod
# Date 1176404576 25200
# Node ID 584ab2a62af5b9b599aa4c58ddfe9cf39add0ea3
# Parent  e5f24a83d909b813d12489400ec516fc447c0c31
[svn] - if handle->cancel = TRUE, immediately abort the fread operation.

diff -r e5f24a83d909 -r 584ab2a62af5 ChangeLog
--- a/ChangeLog	Thu Apr 12 11:35:08 2007 -0700
+++ b/ChangeLog	Thu Apr 12 12:02:56 2007 -0700
@@ -1,3 +1,11 @@
+2007-04-12 18:35:08 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [2012]
+  - comment out debug cflags
+  
+  trunk/src/curl/Makefile |   10 +++++-----
+  1 file changed, 5 insertions(+), 5 deletions(-)
+
+
 2007-04-12 18:29:55 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [2010]
   - fix last warnings
diff -r e5f24a83d909 -r 584ab2a62af5 src/curl/curl.c
--- a/src/curl/curl.c	Thu Apr 12 11:35:08 2007 -0700
+++ b/src/curl/curl.c	Thu Apr 12 12:02:56 2007 -0700
@@ -729,6 +729,8 @@
 	  //g_print("Wait for data on %p\n", handle);
 	  g_usleep(10000);
 	}
+      if (handle->cancel)
+          return (ret / size);
       if (available > sz - ret)
 	available = sz - ret;
       memcpy(ptr + ret, handle->buffer + handle->rd_index, available);